diff options
| author | shennetsind <ind@henn.et> | 2013-11-02 17:15:41 -0200 |
|---|---|---|
| committer | shennetsind <ind@henn.et> | 2013-11-02 17:15:41 -0200 |
| commit | cf1ed8794ad2cfe66ec111484fc5d17f7c09ac22 (patch) | |
| tree | 73815027b00f2519fda6ce5fe313f13b71fa2595 /npc/re/cities/brasilis.txt | |
| parent | b2f125a5f3f25b9bcb68d4b755bacf988f0f1fcd (diff) | |
| parent | 566529c819bcf9aeb1bd3a4a691c443c2b88d076 (diff) | |
| download | hercules-cf1ed8794ad2cfe66ec111484fc5d17f7c09ac22.tar.gz hercules-cf1ed8794ad2cfe66ec111484fc5d17f7c09ac22.tar.bz2 hercules-cf1ed8794ad2cfe66ec111484fc5d17f7c09ac22.tar.xz hercules-cf1ed8794ad2cfe66ec111484fc5d17f7c09ac22.zip | |
Merge remote-tracking branch 'upstream/master'
Signed-off-by: shennetsind <ind@henn.et>
Conflicts:
sql-files/main.sql
sql-files/upgrades/index.txt
src/common/mmo.h
Diffstat (limited to 'npc/re/cities/brasilis.txt')
| -rw-r--r-- | npc/re/cities/brasilis.txt | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/npc/re/cities/brasilis.txt b/npc/re/cities/brasilis.txt index 7be84507c..fe9f768c4 100644 --- a/npc/re/cities/brasilis.txt +++ b/npc/re/cities/brasilis.txt @@ -17,7 +17,7 @@ // Brasilis Transportation //============================================================ /* Pre-Renewal coordinates: alberta,247,115,3 */ -alberta,246,82,3 script Crewman#bra2 100,{ +alberta,246,82,3 script Crewman#bra2 4W_SAILOR,{ mes "[Crewman]"; mes "Hey, have you heard of a place called Brasilis?"; mes "It's a tropical city that's hot like the desert but also rainy. It is a very mysterious place."; @@ -48,7 +48,7 @@ alberta,246,82,3 script Crewman#bra2 100,{ } } -brasilis,316,57,3 script Crewman#bra1 100,{ +brasilis,316,57,3 script Crewman#bra1 4W_SAILOR,{ mes "[Crewman]"; mes "My ship is going to back to Alberta, do you want to join us?"; next; @@ -71,36 +71,36 @@ brasilis,316,57,3 script Crewman#bra1 100,{ // Generic Brasilis NPCs //============================================================ -brasilis,155,165,3 script Signpost#bra1 858,{ +brasilis,155,165,3 script Signpost#bra1 4_BULLETIN_BOARD2,{ mes ":: Art Museum ::"; close; } -brasilis,195,231,3 script Signpost#bra2 858,{ +brasilis,195,231,3 script Signpost#bra2 4_BULLETIN_BOARD2,{ mes ":: Verass Monument ::"; close; } -brasilis,240,247,3 script Signpost#bra3 858,{ +brasilis,240,247,3 script Signpost#bra3 4_BULLETIN_BOARD2,{ mes ":: Market ::"; mes " "; mes "- For your Potions and Weaponry -"; close; } -brasilis,303,309,3 script Signpost#bra4 858,{ +brasilis,303,309,3 script Signpost#bra4 4_BULLETIN_BOARD2,{ mes ":: Jungle Cable ::"; mes ""; mes "- Not for the faint of heart -"; close; } -brasilis,278,137,3 script Signpost#bra5 858,{ +brasilis,278,137,3 script Signpost#bra5 4_BULLETIN_BOARD2,{ mes ":: Brasilis Hotel ::"; close; } -brasilis,137,77,5 script Ice-Cream Maker 85,{ +brasilis,137,77,5 script Ice-Cream Maker 4_M_03,{ mes "[Ice Cream Maker]"; mes "Come~come~"; mes "Ice cream is the perfect snack for a hot day~"; |