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/battleground/tierra/tierra_enter.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/battleground/tierra/tierra_enter.txt')
| -rw-r--r-- | npc/battleground/tierra/tierra_enter.txt | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/npc/battleground/tierra/tierra_enter.txt b/npc/battleground/tierra/tierra_enter.txt index 0262f9fcd..9089017a0 100644 --- a/npc/battleground/tierra/tierra_enter.txt +++ b/npc/battleground/tierra/tierra_enter.txt @@ -14,7 +14,7 @@ // First Tierra Gorge Officers - Guillaume //============================================================ -bat_room,124,178,5 script Tierra Gorge Officer#01a 418,{ +bat_room,124,178,5 script Tierra Gorge Officer#01a 4_M_KY_KNT,{ if (checkweight(1201,1) == 0) { mes "- Wait a minute !! -"; mes "- Currently you're carrying -"; @@ -81,7 +81,7 @@ bat_room,124,178,5 script Tierra Gorge Officer#01a 418,{ close; } -bat_room,140,178,5 script Tierra Gorge Officer#02a 418,{ +bat_room,140,178,5 script Tierra Gorge Officer#02a 4_M_KY_KNT,{ if (checkweight(1201,1) == 0) { mes "- Wait a minute !! -"; mes "- Currently you're carrying -"; @@ -148,7 +148,7 @@ bat_room,140,178,5 script Tierra Gorge Officer#02a 418,{ close; } -bat_room,127,178,5 script Guillaume Knight#1 417,{ +bat_room,127,178,5 script Guillaume Knight#1 4_M_KY_SOLD,{ mes "[Guillaume Knight]"; mes "Tierra Gorge consists of two steep sides placed vertically, and has ration depots for the Guillaume and Croix Armies at the 11 and 7 o'clock directions."; next; @@ -172,7 +172,7 @@ bat_room,127,178,5 script Guillaume Knight#1 417,{ close; } -bat_room,143,178,5 script Guillaume Knight#2 417,{ +bat_room,143,178,5 script Guillaume Knight#2 4_M_KY_SOLD,{ mes "[Guillaume Knight]"; mes "Tierra Gorge consists of two steep sides placed vertically, and has ration depots for the Guillaume and Croix Armies at the 11 and 7 o'clock directions."; next; @@ -196,7 +196,7 @@ bat_room,143,178,5 script Guillaume Knight#2 417,{ close; } -bat_room,127,121,1 script Croix Knight#1 413,{ +bat_room,127,121,1 script Croix Knight#1 4_M_CRU_SOLD,{ mes "[Croix Knight]"; mes "Tierra Gorge consists of two steep sides placed vertically, and has ration depots for the Guillaume and Croix Armies at the 11 and 7 o'clock directions."; next; @@ -220,7 +220,7 @@ bat_room,127,121,1 script Croix Knight#1 413,{ close; } -bat_room,143,121,1 script Croix Knight#2 413,{ +bat_room,143,121,1 script Croix Knight#2 4_M_CRU_SOLD,{ mes "[Croix Knight]"; mes "Tierra Gorge consists of two steep sides placed vertically, and has ration depots for the Guillaume and Croix Armies at the 11 and 7 o'clock directions."; next; @@ -246,7 +246,7 @@ bat_room,143,121,1 script Croix Knight#2 413,{ // Second Tierra Gorge Officers - Croix //============================================================ -bat_room,125,121,1 script Tierra Gorge Officer#01b 414,{ +bat_room,125,121,1 script Tierra Gorge Officer#01b 4_M_CRU_KNT,{ if (checkweight(1201,1) == 0) { mes "- Wait a minute !! -"; mes "- Currently you're carrying -"; @@ -313,7 +313,7 @@ bat_room,125,121,1 script Tierra Gorge Officer#01b 414,{ close; } -bat_room,140,121,1 script Tierra Gorge Officer#02b 414,{ +bat_room,140,121,1 script Tierra Gorge Officer#02b 4_M_CRU_KNT,{ if (checkweight(1201,1) == 0) { mes "- Wait a minute !! -"; mes "- Currently you're carrying -"; |