diff options
| -rw-r--r-- | db/Changelog.txt | 4 | ||||
| -rw-r--r-- | db/map_cache.dat | bin | 1587617 -> 1606491 bytes | |||
| -rw-r--r-- | db/mob_avail.txt | 35 | ||||
| -rw-r--r-- | src/map/atcommand.c | 3 | ||||
| -rw-r--r-- | src/map/charcommand.c | 3 | ||||
| -rw-r--r-- | src/map/map.c | 44 |
6 files changed, 20 insertions, 69 deletions
diff --git a/db/Changelog.txt b/db/Changelog.txt index 8e7e777f2..8a436d802 100644 --- a/db/Changelog.txt +++ b/db/Changelog.txt @@ -48,6 +48,10 @@ 13107 Western_Outlaw Need correct HIT and ASPD Rate ---- ======================== +08/12 + * Updated the mapcache with data for moscovia maps + * Removed "Crusader quest monsters" from mob_avail (not used anymore) + * Replaced some mob_avail.txt entries with a simple example entry [ultramage] 08/11 * Added remaining 11.2 skill db entries [Playtester] * Implemented 11.2 skills in the skill_db [Playtester] diff --git a/db/map_cache.dat b/db/map_cache.dat Binary files differindex d95d946fc..a295f4481 100644 --- a/db/map_cache.dat +++ b/db/map_cache.dat diff --git a/db/mob_avail.txt b/db/mob_avail.txt index fc8a73934..f98c2fbab 100644 --- a/db/mob_avail.txt +++ b/db/mob_avail.txt @@ -7,13 +7,7 @@ // Use Item ID for weapons and shields, not View ID. //1002,1039 //Poring,Baphomet (Make Porings look like Baphomet) - -//Crusader quest monsters with poring stats -1910,1036,0 -1911,1132,0 -1912,1257,0 -1913,1164,0 -1914,1276,0 +//1970,1002,10013 // new mob that looks like a Poring with a backpack // Easter Event Monsters 1920,1047,0 @@ -30,30 +24,3 @@ 1903,4012,1,21,0,1720,0,102,184,57,16,0 // Sentry 1904,1286,0 - -// eAthena Custom Equipped Mobs -1970,1002,10013 -1971,1011,10002 -1972,1014,10017 -1973,1019,10010 -1974,1023,10009 -1975,1026,10008 -1976,1029,10006 -1977,1031,10013 -1978,1035,10002 -1979,1042,10002 -1980,1049,10012 -1981,1052,10014 -1982,1056,10019 -1983,1057,10018 -1984,1063,10007 -1985,1077,10017 -1986,1101,10001 -1987,1107,10003 -1988,1109,10004 -1989,1110,10005 -1990,1113,10013 -1991,1155,10011 -1992,1167,10015 -1993,1170,10016 -1994,1188,10020 diff --git a/src/map/atcommand.c b/src/map/atcommand.c index 80a68792d..5b512a85c 100644 --- a/src/map/atcommand.c +++ b/src/map/atcommand.c @@ -6110,7 +6110,8 @@ int atcommand_disguise(const int fd, struct map_session_data* sd, const char* co if(pc_isriding(sd)) { - clif_displaymessage(fd, msg_txt(227)); // Character cannot wear disguise while riding a PecoPeco. + //FIXME: wrong message + //clif_displaymessage(fd, msg_txt(227)); // Character cannot wear disguise while riding a PecoPeco. return -1; } diff --git a/src/map/charcommand.c b/src/map/charcommand.c index bfd41f346..cee5f995e 100644 --- a/src/map/charcommand.c +++ b/src/map/charcommand.c @@ -3278,7 +3278,8 @@ int charcommand_disguise(const int fd, struct map_session_data* sd, const char* if(pc_isriding(pl_sd)) { - clif_displaymessage(fd, msg_txt(228)); // Character cannot wear disguise while riding a PecoPeco. + //FIXME: wrong message + //clif_displaymessage(fd, msg_txt(228)); // Character cannot wear disguise while riding a PecoPeco. return -1; } diff --git a/src/map/map.c b/src/map/map.c index 566915a3c..8d3e06e54 100644 --- a/src/map/map.c +++ b/src/map/map.c @@ -2109,38 +2109,14 @@ int map_check_dir(int s_dir,int t_dir) if(s_dir == t_dir) return 0; switch(s_dir) { - case 0: - if(t_dir == 7 || t_dir == 1 || t_dir == 0) - return 0; - break; - case 1: - if(t_dir == 0 || t_dir == 2 || t_dir == 1) - return 0; - break; - case 2: - if(t_dir == 1 || t_dir == 3 || t_dir == 2) - return 0; - break; - case 3: - if(t_dir == 2 || t_dir == 4 || t_dir == 3) - return 0; - break; - case 4: - if(t_dir == 3 || t_dir == 5 || t_dir == 4) - return 0; - break; - case 5: - if(t_dir == 4 || t_dir == 6 || t_dir == 5) - return 0; - break; - case 6: - if(t_dir == 5 || t_dir == 7 || t_dir == 6) - return 0; - break; - case 7: - if(t_dir == 6 || t_dir == 0 || t_dir == 7) - return 0; - break; + case 0: if(t_dir == 7 || t_dir == 1 || t_dir == 0) return 0; break; + case 1: if(t_dir == 0 || t_dir == 2 || t_dir == 1) return 0; break; + case 2: if(t_dir == 1 || t_dir == 3 || t_dir == 2) return 0; break; + case 3: if(t_dir == 2 || t_dir == 4 || t_dir == 3) return 0; break; + case 4: if(t_dir == 3 || t_dir == 5 || t_dir == 4) return 0; break; + case 5: if(t_dir == 4 || t_dir == 6 || t_dir == 5) return 0; break; + case 6: if(t_dir == 5 || t_dir == 7 || t_dir == 6) return 0; break; + case 7: if(t_dir == 6 || t_dir == 0 || t_dir == 7) return 0; break; } return 1; } @@ -2489,14 +2465,16 @@ static void map_delmapid(int id) int map_delmap(char* mapname) { int i; + char map_name[MAP_NAME_LENGTH]; if (strcmpi(mapname, "all") == 0) { map_num = 0; return 0; } + mapindex_getmapname(mapname, map_name); for(i = 0; i < map_num; i++) { - if (strcmp(map[i].name, mapname) <= 0) { + if (strcmp(map[i].name, map_name) == 0) { map_delmapid(i); return 1; } |