summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
authorChilly0123 <Chilly0123@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-01-04 14:44:43 +0000
committerChilly0123 <Chilly0123@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-01-04 14:44:43 +0000
commit45ba3918191ff7aa8ce3be40ddfae0927b0b507a (patch)
treed55fa5a3d46cd8de531053ee1ab0fb5a4383c6ff /src/map
parent92ce1562699681d1b30d1a5c50d830cd1d396bc4 (diff)
downloadhercules-45ba3918191ff7aa8ce3be40ddfae0927b0b507a.tar.gz
hercules-45ba3918191ff7aa8ce3be40ddfae0927b0b507a.tar.bz2
hercules-45ba3918191ff7aa8ce3be40ddfae0927b0b507a.tar.xz
hercules-45ba3918191ff7aa8ce3be40ddfae0927b0b507a.zip
*Added 2 new accessory skills.
*Reverted some mob changes from 15387. *Updated @go list and locations. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15388 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map')
-rw-r--r--src/map/atcommand.c31
-rw-r--r--src/map/skill.c32
-rw-r--r--src/map/skill.h2
3 files changed, 61 insertions, 4 deletions
diff --git a/src/map/atcommand.c b/src/map/atcommand.c
index 03ce58015..3dadc888d 100644
--- a/src/map/atcommand.c
+++ b/src/map/atcommand.c
@@ -2300,9 +2300,16 @@ ACMD_FUNC(go)
{ MAP_RACHEL, 130, 110 }, // 23=Rachel
{ MAP_VEINS, 216, 123 }, // 24=Veins
{ MAP_MOSCOVIA, 223, 184 }, // 25=Moscovia
- { MAP_BRASILIS, 182, 239 }, // 26=Brasilis
+ { 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
};
nullpo_retr(-1, sd);
@@ -2330,8 +2337,10 @@ ACMD_FUNC(go)
clif_displaymessage(fd, " 15=Novice Grounds 16=Prison 17=Jawaii");
clif_displaymessage(fd, " 18=Ayothaya 19=Einbroch 20=Lighthalzen");
clif_displaymessage(fd, " 21=Einbech 22=Hugel 23=Rachel");
- clif_displaymessage(fd, " 24=Veins 25=Moscovia 26=Brasilis");
- clif_displaymessage(fd, " 27=Manuk 28=Splendide");
+ clif_displaymessage(fd, " 24=Veins 25=Moscovia 26=Midgard Camp");
+ clif_displaymessage(fd, " 27=Manuk 28=Splendide 29=Brasilis");
+ clif_displaymessage(fd, " 30=El Dicastes 31=Mora 32=Dewata");
+ clif_displaymessage(fd, " 33=Malangdo Island 34=Malaya Port 35=Eclage");
return -1;
}
@@ -2405,12 +2414,26 @@ ACMD_FUNC(go)
town = 24;
} else if (strncmp(map_name, "moscovia", 3) == 0) {
town = 25;
- } else if (strncmp(map_name, "brasilis", 3) == 0) {
+ } 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 (strncmp(map_name, "mora", 3) == 0) {
+ town = 31;
+ } else if (strncmp(map_name, "dewata", 3) == 0) {
+ town = 32;
+ } else if (strncmp(map_name, "malangdo", 3) == 0) {
+ town = 33;
+ } else if (strncmp(map_name, "malaya", 3) == 0) {
+ town = 34;
+ } else if (strncmp(map_name, "eclage", 3) == 0) {
+ town = 35;
}
if (town >= 0 && town < ARRAYLENGTH(data))
diff --git a/src/map/skill.c b/src/map/skill.c
index 4ad5a2f22..19815ad1c 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -469,6 +469,8 @@ int skillnotok (int skillid, struct map_session_data *sd)
switch (skillid) {
case AL_WARP:
+ case RETURN_TO_ELDICASTES:
+ case ALL_GUARDIAN_RECALL:
if(map[m].flag.nowarp) {
clif_skill_teleportmessage(sd,0);
return 1;
@@ -7201,6 +7203,36 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in
clif_skill_nodamage(src, bl, skillid, skilllv, 1);
}
break;
+
+ case RETURN_TO_ELDICASTES:
+ case ALL_GUARDIAN_RECALL:
+ if( sd )
+ {
+ short x, y; // Destiny position.
+ unsigned short mapindex;
+
+ if( skillid == RETURN_TO_ELDICASTES)
+ {
+ x = 198;
+ y = 187;
+ mapindex = mapindex_name2id(MAP_DICASTES);
+ }
+ else
+ {
+ x = 44;
+ y = 151;
+ mapindex = mapindex_name2id(MAP_MORA);
+ }
+
+ if(!mapindex)
+ { //Given map not found?
+ clif_skill_fail(sd,skillid,0,0,0);
+ return 0;
+ }
+ pc_setpos(sd, mapindex, x, y, CLR_TELEPORT);
+ }
+ break;
+
default:
ShowWarning("skill_castend_nodamage_id: Unknown skill used:%d\n",skillid);
clif_skill_nodamage(src,bl,skillid,skilllv,1);
diff --git a/src/map/skill.h b/src/map/skill.h
index 2e4a68fa4..75eb2a30e 100644
--- a/src/map/skill.h
+++ b/src/map/skill.h
@@ -1329,6 +1329,8 @@ enum e_skill {
ALL_ODINS_RECALL = 2533,
RETURN_TO_ELDICASTES,
ALL_BUYING_STORE,
+ ALL_GUARDIAN_RECALL,
+ ALL_ODINS_POWER,
HLIF_HEAL = 8001,
HLIF_AVOID,