summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjmanfffreak <jmanfffreak@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-12-12 02:33:14 +0000
committerjmanfffreak <jmanfffreak@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-12-12 02:33:14 +0000
commitc1ccfd841496368ceb104f3d1b9edb54d2dca977 (patch)
tree4b29b51e84aae4a8ec89610e22bf32ec39913c88
parent25404edf73f8c6e484a2b9c53a94f78558b422f6 (diff)
downloadhercules-c1ccfd841496368ceb104f3d1b9edb54d2dca977.tar.gz
hercules-c1ccfd841496368ceb104f3d1b9edb54d2dca977.tar.bz2
hercules-c1ccfd841496368ceb104f3d1b9edb54d2dca977.tar.xz
hercules-c1ccfd841496368ceb104f3d1b9edb54d2dca977.zip
Corrected an event mob being summoned in Endless tower (bugreport:4942)
Added @go locations for new maps (not official, but they're there) (bugreport:4457) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15070 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--npc/instances/EndlessTower.txt2
-rw-r--r--src/common/mapindex.h3
-rw-r--r--src/map/atcommand.c6
3 files changed, 9 insertions, 2 deletions
diff --git a/npc/instances/EndlessTower.txt b/npc/instances/EndlessTower.txt
index 69fd2e65a..f7d1b4632 100644
--- a/npc/instances/EndlessTower.txt
+++ b/npc/instances/EndlessTower.txt
@@ -2860,7 +2860,7 @@ OnEnable:
areamonster "3@tower",181,9,191,45,"Aliza",1737,10,instance_npcname("72FGate102tower", instance_id())+"::OnMyMobDead";
areamonster "3@tower",181,9,191,45,"Zealotus",1200,5,instance_npcname("72FGate102tower", instance_id())+"::OnMyMobDead";
areamonster "3@tower",181,9,191,45,"Alice",1275,5,instance_npcname("72FGate102tower", instance_id())+"::OnMyMobDead";
- areamonster "3@tower",181,9,191,45,"Green Maiden",1519,10,instance_npcname("72FGate102tower", instance_id())+"::OnMyMobDead";
+ areamonster "3@tower",181,9,191,45,"Green Maiden",1631,10,instance_npcname("72FGate102tower", instance_id())+"::OnMyMobDead";
end;
OnTouch_:
diff --git a/src/common/mapindex.h b/src/common/mapindex.h
index 854669ea6..36e49072d 100644
--- a/src/common/mapindex.h
+++ b/src/common/mapindex.h
@@ -36,6 +36,9 @@ extern char mapindex_cfgfile[80];
#define MAP_JAIL "sec_pri"
#define MAP_NOVICE "new_1-1"
#define MAP_MOSCOVIA "moscovia"
+#define MAP_BRASILIS "brasilis"
+#define MAP_MANUK "manuk"
+#define MAP_SPLENDIDE "splendide"
const char* mapindex_getmapname(const char* string, char* output);
const char* mapindex_getmapname_ext(const char* string, char* output);
diff --git a/src/map/atcommand.c b/src/map/atcommand.c
index 9290f844a..03c92c07a 100644
--- a/src/map/atcommand.c
+++ b/src/map/atcommand.c
@@ -2279,6 +2279,9 @@ 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_MANUK, 282, 138 }, // 27=Manuk
+ { MAP_SPLENDIDE, 197, 176 }, // 28=Splendide
};
nullpo_retr(-1, sd);
@@ -2306,7 +2309,8 @@ 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");
+ clif_displaymessage(fd, " 24=Veins 25=Moscovia 26=Brasilis");
+ clif_displaymessage(fd, " 27=Manuk 28=Splendide");
return -1;
}