diff options
| -rw-r--r-- | conf/map/maps.conf | 1 | ||||
| -rw-r--r-- | db/map_index.txt | 49 | ||||
| -rw-r--r-- | maps/re/023-3-2.mcache | bin | 170 -> 169 bytes | |||
| -rw-r--r-- | maps/re/027-1.mcache | bin | 0 -> 965 bytes | |||
| -rw-r--r-- | npc/027-1/_import.txt | 5 | ||||
| -rw-r--r-- | npc/027-1/_mobs.txt | 12 | ||||
| -rw-r--r-- | npc/027-1/_warps.txt | 3 | ||||
| -rw-r--r-- | npc/027-1/statue.txt | 26 | ||||
| -rw-r--r-- | npc/_import.txt | 1 | ||||
| -rw-r--r-- | npc/functions/scoreboards.txt | 5 | ||||
| -rw-r--r-- | npc/functions/weather.txt | 1 |
11 files changed, 78 insertions, 25 deletions
diff --git a/conf/map/maps.conf b/conf/map/maps.conf index 37a78b443..df0650997 100644 --- a/conf/map/maps.conf +++ b/conf/map/maps.conf @@ -176,6 +176,7 @@ map_list: ( "024-9", "025-2-1", "025-2", + "027-1", "boss", "botcheck", "guilds", diff --git a/db/map_index.txt b/db/map_index.txt index 7f40c507c..7e141da41 100644 --- a/db/map_index.txt +++ b/db/map_index.txt @@ -173,27 +173,28 @@ 024-9 173 025-2-1 174 025-2 175 -boss 176 -botcheck 177 -guilds 178 -maze0 179 -maze1 180 -maze10 181 -maze11 182 -maze12 183 -maze13 184 -maze14 185 -maze15 186 -maze2 187 -maze3 188 -maze4 189 -maze5 190 -maze6 191 -maze7 192 -maze8 193 -maze9 194 -sec_pri 195 -soren-2 196 -soren 197 -test 198 -testbg 199 +027-1 176 +boss 177 +botcheck 178 +guilds 179 +maze0 180 +maze1 181 +maze10 182 +maze11 183 +maze12 184 +maze13 185 +maze14 186 +maze15 187 +maze2 188 +maze3 189 +maze4 190 +maze5 191 +maze6 192 +maze7 193 +maze8 194 +maze9 195 +sec_pri 196 +soren-2 197 +soren 198 +test 199 +testbg 200 diff --git a/maps/re/023-3-2.mcache b/maps/re/023-3-2.mcache Binary files differindex 936b28500..9748b9336 100644 --- a/maps/re/023-3-2.mcache +++ b/maps/re/023-3-2.mcache diff --git a/maps/re/027-1.mcache b/maps/re/027-1.mcache Binary files differnew file mode 100644 index 000000000..e00874dc2 --- /dev/null +++ b/maps/re/027-1.mcache diff --git a/npc/027-1/_import.txt b/npc/027-1/_import.txt new file mode 100644 index 000000000..0a47df142 --- /dev/null +++ b/npc/027-1/_import.txt @@ -0,0 +1,5 @@ +// Map 027-1: The Academy Island +// This file is generated automatically. All manually added changes will be removed when running the Converter. +"npc/027-1/_mobs.txt", +"npc/027-1/_warps.txt", +"npc/027-1/statue.txt", diff --git a/npc/027-1/_mobs.txt b/npc/027-1/_mobs.txt new file mode 100644 index 000000000..e1f310359 --- /dev/null +++ b/npc/027-1/_mobs.txt @@ -0,0 +1,12 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 027-1: The Academy Island mobs +027-1,77,95,4,3 monster Duck 1029,2,60000,30000 +027-1,29,146,10,10 monster Magic Ratto 1126,3,60000,30000 +027-1,57,127,9,3 monster Mana Piou 1155,3,60000,30000 +027-1,114,116,30,25 monster Red Butterfly 1025,7,60000,30000 +027-1,128,25,12,6 monster Duck 1029,2,60000,30000 +027-1,150,48,10,30 monster Croc 1006,6,60000,30000 +027-1,59,116,24,25 monster Mana Bug 1075,4,60000,30000 +027-1,100,152,60,7 monster Sea Slime 1093,12,60000,30000 +027-1,149,117,11,27 monster Piou 1002,4,60000,30000 +027-1,89,65,26,25 monster Cyan Butterfly 1172,6,60000,30000 diff --git a/npc/027-1/_warps.txt b/npc/027-1/_warps.txt new file mode 100644 index 000000000..55b3f945f --- /dev/null +++ b/npc/027-1/_warps.txt @@ -0,0 +1,3 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 027-1: The Academy Island warps +027-1,90,156,0 warp #027-1_90_156 5,0,003-1,59,59 diff --git a/npc/027-1/statue.txt b/npc/027-1/statue.txt new file mode 100644 index 000000000..dc21ef37a --- /dev/null +++ b/npc/027-1/statue.txt @@ -0,0 +1,26 @@ +// TMW-2 Script +// Author: +// Jesusalva +// Description: +// These statues are of great honor to whoever have their name written in them! + +027-1,57,115,0 script Hero Statue#027-1 NPC_STATUE_ANDREI,{ + + mes l("In honor of %s, the greatest hero this world has even seen.", b("Andrei Sakar")); + mes ""; + if ($MOST_HEROIC$ != "") { + mes l("In honor of %s, for their great deeds of recent bravery in face of impending doom.", $MOST_HEROIC$); + mes ""; + } + mes l("In honor of %s, founder of this academy, whom built this academy WITH HIS OWN HANDS, WITH BLOOD SWEAT AND TEARS.", b("Jesusalva")); + mes ""; + mes l("Also in honor of the other two sages, %s and %s. And finally, notable mention for the noble %s, %s and %s, for sponsoring this Academy.", b("Saulc"), b("Crazyfefe"), b("Micksha"), b("omatt"), b(rand_sponsor())); + + close; + +OnInit: + .sex = G_OTHER; + .distance = 4; + end; +} + diff --git a/npc/_import.txt b/npc/_import.txt index 5a4b32f53..daab26939 100644 --- a/npc/_import.txt +++ b/npc/_import.txt @@ -175,6 +175,7 @@ @include "npc/024-9/_import.txt" @include "npc/025-2-1/_import.txt" @include "npc/025-2/_import.txt" +@include "npc/027-1/_import.txt" @include "npc/boss/_import.txt" @include "npc/botcheck/_import.txt" @include "npc/guilds/_import.txt" diff --git a/npc/functions/scoreboards.txt b/npc/functions/scoreboards.txt index 41e8078dd..fa1734ea4 100644 --- a/npc/functions/scoreboards.txt +++ b/npc/functions/scoreboards.txt @@ -306,7 +306,10 @@ function script HallOfSponsor { } return; } - +// Returns the name of a random sponsor +function script rand_sponsor { + return any("Saulc", "Woody", "Sharli"); +} // HallOfGame() function script HallOfGame { diff --git a/npc/functions/weather.txt b/npc/functions/weather.txt index 4c87c9627..561c6b596 100644 --- a/npc/functions/weather.txt +++ b/npc/functions/weather.txt @@ -88,6 +88,7 @@ OnInit: htput(.wcore, "018-2", "woodland"); htput(.wcore, "018-4", "woodland"); htput(.wcore, "018-5", "woodland"); + htput(.wcore, "027-1", "woodland"); // Icelands htput(.wcore, "001-7", "iceland"); |