Skip to content

Commit

Permalink
Improved @go command
Browse files Browse the repository at this point in the history 
- Corrected checks to correctly display the help message when an
  invalid map name is requested (rather than warping to Prontera)
- Removed huge list of hardcoded town names (special thanks to KeiKun).

Signed-off-by: Haru <haru@dotalux.com>
  • Loading branch information
@MishimaHaruna
MishimaHaruna committed May 20, 2014
1 parent ed9dd7c commit 67d5e67
Showing 1 changed file with 84 additions and 137 deletions.
221 changes: 84 additions & 137 deletions src/map/atcommand.c
View file
Expand Up @@ -1721,67 +1721,63 @@ ACMD(hair_color)
/*==========================================
* @go [city_number or city_name] - Updated by Harbin
*------------------------------------------*/
ACMD(go)
{
ACMD(go) {
int i;
int town;
int town = INT_MAX; // Initialized to INT_MAX instead of -1 to avoid conflicts with those who map [-3:-1] to @memo locations.
char map_name[MAP_NAME_LENGTH];
int16 m;

const struct {
char map[MAP_NAME_LENGTH];
int x, y;
int min_match; ///< Minimum string length to match
} data[] = {
{ MAP_PRONTERA, 156, 191 }, // 0=Prontera
{ MAP_MORROC, 156, 93 }, // 1=Morroc
{ MAP_GEFFEN, 119, 59 }, // 2=Geffen
{ MAP_PAYON, 162, 233 }, // 3=Payon
{ MAP_ALBERTA, 192, 147 }, // 4=Alberta
{ MAP_PRONTERA, 156, 191, 3 }, // 0 = Prontera
{ MAP_MORROC, 156, 93, 4 }, // 1 = Morroc
{ MAP_GEFFEN, 119, 59, 3 }, // 2 = Geffen
{ MAP_PAYON, 162, 233, 3 }, // 3 = Payon
{ MAP_ALBERTA, 192, 147, 3 }, // 4 = Alberta
#ifdef RENEWAL
{ MAP_IZLUDE, 128, 146 }, // 5=Izlude (Renewal)
{ MAP_IZLUDE, 128, 146, 3 }, // 5 = Izlude (Renewal)
#else
{ MAP_IZLUDE, 128, 114 }, // 5=Izlude
{ MAP_IZLUDE, 128, 114, 3 }, // 5 = Izlude
#endif
{ MAP_ALDEBARAN, 140, 131 }, // 6=Al de Baran
{ MAP_LUTIE, 147, 134 }, // 7=Lutie
{ MAP_COMODO, 209, 143 }, // 8=Comodo
{ MAP_YUNO, 157, 51 }, // 9=Yuno
{ MAP_AMATSU, 198, 84 }, // 10=Amatsu
{ MAP_GONRYUN, 160, 120 }, // 11=Gonryun
{ MAP_UMBALA, 89, 157 }, // 12=Umbala
{ MAP_NIFLHEIM, 21, 153 }, // 13=Niflheim
{ MAP_LOUYANG, 217, 40 }, // 14=Louyang
{ MAP_NOVICE, 53, 111 }, // 15=Training Grounds
{ MAP_JAIL, 23, 61 }, // 16=Prison
{ MAP_JAWAII, 249, 127 }, // 17=Jawaii
{ MAP_AYOTHAYA, 151, 117 }, // 18=Ayothaya
{ MAP_EINBROCH, 64, 200 }, // 19=Einbroch
{ MAP_LIGHTHALZEN, 158, 92 }, // 20=Lighthalzen
{ MAP_EINBECH, 70, 95 }, // 21=Einbech
{ MAP_HUGEL, 96, 145 }, // 22=Hugel
{ MAP_RACHEL, 130, 110 }, // 23=Rachel
{ MAP_VEINS, 216, 123 }, // 24=Veins
{ MAP_MOSCOVIA, 223, 184 }, // 25=Moscovia
{ MAP_MIDCAMP, 180, 240 }, // 26=Midgard Camp
{ MAP_MANUK, 282, 138 }, // 27=Manuk
{ MAP_SPLENDIDE, 197, 176 }, // 28=Splendide
{ MAP_BRASILIS, 182, 239 }, // 29=Brasilis
{ MAP_DICASTES, 198, 187 }, // 30=El Dicastes
{ MAP_MORA, 44, 151 }, // 31=Mora
{ MAP_DEWATA, 200, 180 }, // 32=Dewata
{ MAP_MALANGDO, 140, 114 }, // 33=Malangdo Island
{ MAP_MALAYA, 242, 211 }, // 34=Malaya Port
{ MAP_ECLAGE, 110, 39 }, // 35=Eclage
{ MAP_ALDEBARAN, 140, 131, 3 }, // 6 = Aldebaran
{ MAP_LUTIE, 147, 134, 3 }, // 7 = Lutie
{ MAP_COMODO, 209, 143, 3 }, // 8 = Comodo
{ MAP_YUNO, 157, 51, 3 }, // 9 = Juno
{ MAP_AMATSU, 198, 84, 3 }, // 10 = Amatsu
{ MAP_GONRYUN, 160, 120, 3 }, // 11 = Kunlun
{ MAP_UMBALA, 89, 157, 3 }, // 12 = Umbala
{ MAP_NIFLHEIM, 21, 153, 3 }, // 13 = Niflheim
{ MAP_LOUYANG, 217, 40, 3 }, // 14 = Luoyang
{ MAP_NOVICE, 53, 111, 3 }, // 15 = Training Grounds
{ MAP_JAIL, 23, 61, 3 }, // 16 = Prison
{ MAP_JAWAII, 249, 127, 3 }, // 17 = Jawaii
{ MAP_AYOTHAYA, 151, 117, 3 }, // 18 = Ayothaya
{ MAP_EINBROCH, 64, 200, 5 }, // 19 = Einbroch
{ MAP_LIGHTHALZEN, 158, 92, 3 }, // 20 = Lighthalzen
{ MAP_EINBECH, 70, 95, 5 }, // 21 = Einbech
{ MAP_HUGEL, 96, 145, 3 }, // 22 = Hugel
{ MAP_RACHEL, 130, 110, 3 }, // 23 = Rachel
{ MAP_VEINS, 216, 123, 3 }, // 24 = Veins
{ MAP_MOSCOVIA, 223, 184, 3 }, // 25 = Moscovia
{ MAP_MIDCAMP, 180, 240, 3 }, // 26 = Midgard Camp
{ MAP_MANUK, 282, 138, 3 }, // 27 = Manuk
{ MAP_SPLENDIDE, 197, 176, 3 }, // 28 = Splendide
{ MAP_BRASILIS, 182, 239, 3 }, // 29 = Brasilis
{ MAP_DICASTES, 198, 187, 3 }, // 30 = El Dicastes
{ MAP_MORA, 44, 151, 4 }, // 31 = Mora
{ MAP_DEWATA, 200, 180, 3 }, // 32 = Dewata
{ MAP_MALANGDO, 140, 114, 5 }, // 33 = Malangdo Island
{ MAP_MALAYA, 242, 211, 5 }, // 34 = Malaya Port
{ MAP_ECLAGE, 110, 39, 3 }, // 35 = Eclage
};

memset(map_name, '\0', sizeof(map_name));
memset(atcmd_output, '\0', sizeof(atcmd_output));

// get the number
town = atoi(message);

if (!message || !*message || sscanf(message, "%11s", map_name) < 1 || town < 0 || town >= ARRAYLENGTH(data))
{// no value matched so send the list of locations
if (!message || !*message || sscanf(message, "%11s", map_name) < 1) {
// no value matched so send the list of locations
const char* text;

// attempt to find the text help string
Expand All @@ -1795,98 +1791,49 @@ ACMD(go)

return false;
}

// get possible name of the city
map_name[MAP_NAME_LENGTH-1] = '\0';
for (i = 0; map_name[i]; i++)
map_name[i] = TOLOWER(map_name[i]);
// try to identify the map name
if (strncmp(map_name, "prontera", 3) == 0) {
town = 0;
} else if (strncmp(map_name, "morocc", 4) == 0 ||
strncmp(map_name, "morroc", 4) == 0) {
town = 1;
} else if (strncmp(map_name, "geffen", 3) == 0) {
town = 2;
} else if (strncmp(map_name, "payon", 3) == 0) {
town = 3;
} else if (strncmp(map_name, "alberta", 3) == 0) {
town = 4;
} else if (strncmp(map_name, "izlude", 3) == 0) {
town = 5;
} else if (strncmp(map_name, "aldebaran", 3) == 0) {
town = 6;
} else if (strncmp(map_name, "lutie", 3) == 0 ||
strcmp(map_name, "christmas") == 0 ||
strncmp(map_name, "xmas", 3) == 0 ||
strncmp(map_name, "x-mas", 3) == 0) {
town = 7;
} else if (strncmp(map_name, "comodo", 3) == 0) {
town = 8;
} else if (strncmp(map_name, "juno", 3) == 0 ||
strncmp(map_name, "yuno", 3) == 0) {
town = 9;
} else if (strncmp(map_name, "amatsu", 3) == 0) {
town = 10;
} else if (strncmp(map_name, "kunlun", 3) == 0 ||
strncmp(map_name, "gonryun", 3) == 0) {
town = 11;
} else if (strncmp(map_name, "umbala", 3) == 0) {
town = 12;
} else if (strncmp(map_name, "niflheim", 3) == 0) {
town = 13;
} else if (strncmp(map_name, "louyang", 3) == 0) {
town = 14;
} else if (strncmp(map_name, "new_1-1", 3) == 0 ||
strncmp(map_name, "startpoint", 3) == 0 ||
strncmp(map_name, "beginning", 3) == 0) {
town = 15;
} else if (strncmp(map_name, "sec_pri", 3) == 0 ||
strncmp(map_name, "prison", 3) == 0 ||
strncmp(map_name, "jail", 3) == 0) {
town = 16;
} else if (strncmp(map_name, "jawaii", 3) == 0) {
town = 17;
} else if (strncmp(map_name, "ayothaya", 3) == 0) {
town = 18;
} else if (strncmp(map_name, "einbroch", 5) == 0) {
town = 19;
} else if (strncmp(map_name, "lighthalzen", 3) == 0) {
town = 20;
} else if (strncmp(map_name, "einbech", 5) == 0) {
town = 21;
} else if (strncmp(map_name, "hugel", 3) == 0) {
town = 22;
} else if (strncmp(map_name, "rachel", 3) == 0) {
town = 23;
} else if (strncmp(map_name, "veins", 3) == 0) {
town = 24;
} else if (strncmp(map_name, "moscovia", 3) == 0) {
town = 25;
} else if (strncmp(map_name, "mid_camp", 3) == 0) {
town = 26;
} else if (strncmp(map_name, "manuk", 3) == 0) {
town = 27;
} else if (strncmp(map_name, "splendide", 3) == 0) {
town = 28;
} else if (strncmp(map_name, "brasilis", 3) == 0) {
town = 29;
} else if (strncmp(map_name, "dicastes01", 3) == 0) {
town = 30;
} else if (strcmp(map_name, "mora") == 0) {
town = 31;
} else if (strncmp(map_name, "dewata", 3) == 0) {
town = 32;
} else if (strncmp(map_name, "malangdo", 5) == 0) {
town = 33;
} else if (strncmp(map_name, "malaya", 5) == 0) {
town = 34;
} else if (strncmp(map_name, "eclage", 3) == 0) {
town = 35;

// Numeric entry
if (ISDIGIT(*message) || (message[0] == '-' && ISDIGIT(message[1]))) {
town = atoi(message);
}


if (town < 0 || town >= ARRAYLENGTH(data)) {
map_name[MAP_NAME_LENGTH-1] = '\0';

// Match maps on the list
for (i = 0; i < ARRAYLENGTH(data); i++) {
if (strncmpi(map_name, data[i].map, data[i].min_match) == 0) {
town = i;
break;
}
}
}

if (town < 0 || town >= ARRAYLENGTH(data)) {
// Alternate spellings
if (strncmpi(map_name, "morroc", 4) == 0) { // Correct town name for 'morocc'
town = 1;
} else if (strncmpi(map_name, "lutie", 3) == 0) { // Correct town name for 'xmas'
town = 7;
} else if (strncmpi(map_name, "juno", 3) == 0) { // Correct town name for 'yuno'
town = 9;
} else if (strncmpi(map_name, "kunlun", 3) == 0) { // Original town name for 'gonryun'
town = 11;
} else if (strncmpi(map_name, "luoyang", 3) == 0) { // Original town name for 'louyang'
town = 14;
} else if (strncmpi(map_name, "startpoint", 3) == 0 // Easy to remember alternatives to 'new_1-1'
|| strncmpi(map_name, "beginning", 3) == 0) {
town = 15;
} else if (strncmpi(map_name, "prison", 3) == 0 // Easy to remember alternatives to 'sec_pri'
|| strncmpi(map_name, "jail", 3) == 0) {
town = 16;
} else if (strncmpi(map_name, "rael", 3) == 0) { // Original town name for 'rachel'
town = 23;
}
}

if (town >= 0 && town < ARRAYLENGTH(data)) {
m = map->mapname2mapid(data[town].map);
int16 m = map->mapname2mapid(data[town].map);
if (m >= 0 && map->list[m].flag.nowarpto && !pc_has_permission(sd, PC_PERM_WARP_ANYWHERE)) {
clif->message(fd, msg_txt(247));
return false;
Expand All @@ -1901,7 +1848,7 @@ ACMD(go)
clif->message(fd, msg_txt(1)); // Map not found.
return false;
}
} else { // if you arrive here, you have an error in town variable when reading of names
} else {
clif->message(fd, msg_txt(38)); // Invalid location number or name.
return false;
}
Expand Down

0 comments on commit 67d5e67

Please sign in to comment.