diff --git a/data/npc/brodrosch.npc b/data/npc/brodrosch.npc index 6a33cee..8ff57a6 100644 --- a/data/npc/brodrosch.npc +++ b/data/npc/brodrosch.npc @@ -11,6 +11,8 @@ ADDRESS,"hello$",! -> "Welcome, %N! May Earth protect you, even whilst sailing!" ADDRESS,"hi$",! -> * ADDRESS,"hiho$",! -> * ADDRESS,! -> Idle +BUSY,"please","bring","me","to","cormaya",PZFree,Premium,QuestValue(250)>2,CountMoney>=150,! -> Price=150, "Full steam ahead %N!", Queue, DeleteMoney, EffectOpp(3), Teleport(33309,31989,15), EffectOpp(3) +BUSY,"please","bring","me","to","cormaya",PZFree,Premium,CountMoney>=160,! -> Price=160, "Full steam ahead %N!", Queue, DeleteMoney, EffectOpp(3), Teleport(33309,31989,15), EffectOpp(3) BUSY,"hello$",! -> "Shut up and wait like the rest, jawoll!", Queue BUSY,"hi$",! -> * BUSY,"hiho$",! -> * diff --git a/data/npc/captain1.npc b/data/npc/captain1.npc index 8147991..f548144 100644 --- a/data/npc/captain1.npc +++ b/data/npc/captain1.npc @@ -12,6 +12,24 @@ ADDRESS,"hi$",male,! -> * ADDRESS,"hello$",female,! -> "Welcome on board, Madam %N." ADDRESS,"hi$",female,! -> * ADDRESS,! -> Idle +BUSY,"please","bring","me","to","carlin",PZFree,Premium,QuestValue(250)>2,CountMoney>=100,! -> Price=100, "Set the sails %N!", Queue, DeleteMoney, EffectOpp(11), Teleport(32387,31821,6), EffectOpp(11) +BUSY,"please","bring","me","to","carlin",PZFree,Premium,CountMoney>=110,! -> Price=110, "Set the sails %N!", Queue, DeleteMoney, EffectOpp(11), Teleport(32387,31821,6), EffectOpp(11) + +BUSY,"please","bring","me","to","ab'dendriel",PZFree,Premium,QuestValue(250)>2,CountMoney>=120,! -> Price=120, "Set the sails %N!", Queue, DeleteMoney, EffectOpp(11), Teleport(32733,31668,6), EffectOpp(11) +BUSY,"please","bring","me","to","ab'dendriel",PZFree,Premium,CountMoney>=130,! -> Price=130, "Set the sails %N!", Queue, DeleteMoney, EffectOpp(11), Teleport(32733,31668,6), EffectOpp(11) + +BUSY,"please","bring","me","to","edron",PZFree,Premium,QuestValue(250)>2,CountMoney>=150,! -> Price=150, "Set the sails %N!", Queue, DeleteMoney, EffectOpp(11), Teleport(33175,31764,6), EffectOpp(11) +BUSY,"please","bring","me","to","edron",PZFree,Premium,CountMoney>=160,! -> Price=160, "Set the sails %N!", Queue, DeleteMoney, EffectOpp(11), Teleport(33175,31764,6), EffectOpp(11) + +BUSY,"please","bring","me","to","venore",PZFree,Premium,QuestValue(250)>2,CountMoney>=160,! -> Price=160, "Set the sails %N!", Queue, DeleteMoney, EffectOpp(11), Teleport(32954,32023,6), EffectOpp(11) +BUSY,"please","bring","me","to","venore",PZFree,Premium,CountMoney>=170,! -> Price=170, "Set the sails %N!", Queue, DeleteMoney, EffectOpp(11), Teleport(32954,32023,6), EffectOpp(11) + +BUSY,"please","bring","me","to","port","hope",PZFree,Premium,QuestValue(250)>2,CountMoney>=150,! -> Price=150, "Set the sails %N!", Queue, DeleteMoney, EffectOpp(11), Teleport(32530,32784,6), EffectOpp(11) +BUSY,"please","bring","me","to","port","hope",PZFree,Premium,CountMoney>=160,! -> Price=160, "Set the sails %N!", Queue, DeleteMoney, EffectOpp(11), Teleport(32530,32784,6), EffectOpp(11) + +BUSY,"please","bring","me","to","liberty","bay",PZFree,Premium,QuestValue(250)>2,CountMoney>=170,! -> Price=170, "Set the sails %N!", Queue, DeleteMoney, EffectOpp(11), Teleport(32285,32892,6), EffectOpp(11) +BUSY,"please","bring","me","to","liberty","bay",PZFree,Premium,CountMoney>=180,! -> Price=180, "Set the sails %N!", Queue, DeleteMoney, EffectOpp(11), Teleport(32285,32892,6), EffectOpp(11) + BUSY,"hello$",! -> "One moment please %N. You're next in line.", Queue BUSY,"hi$",! -> * BUSY,! -> NOP diff --git a/data/npc/captain2.npc b/data/npc/captain2.npc index 51494c5..9c53743 100644 --- a/data/npc/captain2.npc +++ b/data/npc/captain2.npc @@ -12,6 +12,18 @@ ADDRESS,"hi$",male,! -> * ADDRESS,"hello$",female,! -> "Welcome on board, Madam %N." ADDRESS,"hi$",female,! -> * ADDRESS,! -> Idle +BUSY,"please","bring","me","to","thais",PZFree,Premium,QuestValue(250)>2,CountMoney>=100,! -> Price=100, "Set the sails %N!", Queue, DeleteMoney, EffectOpp(11), Teleport(32312,32211,6), EffectOpp(11) +BUSY,"please","bring","me","to","thais",PZFree,Premium,CountMoney>=110,! -> Price=110, "Set the sails %N!", Queue, DeleteMoney, EffectOpp(11), Teleport(32312,32211,6), EffectOpp(11) + +BUSY,"please","bring","me","to","ab'dendriel",PZFree,Premium,QuestValue(250)>2,CountMoney>=70,! -> Price=70, "Set the sails %N!", Queue, DeleteMoney, EffectOpp(11), Teleport(32733,31668,6), EffectOpp(11) +BUSY,"please","bring","me","to","ab'dendriel",PZFree,Premium,CountMoney>=80,! -> Price=80, "Set the sails %N!", Queue, DeleteMoney, EffectOpp(11), Teleport(32733,31668,6), EffectOpp(11) + +BUSY,"please","bring","me","to","edron",PZFree,Premium,QuestValue(250)>2,CountMoney>=100,! -> Price=100, "Set the sails %N!", Queue, DeleteMoney, EffectOpp(11), Teleport(33175,31764,6), EffectOpp(11) +BUSY,"please","bring","me","to","edron",PZFree,Premium,CountMoney>=110,! -> Price=110, "Set the sails %N!", Queue, DeleteMoney, EffectOpp(11), Teleport(33175,31764,6), EffectOpp(11) + +BUSY,"please","bring","me","to","venore",PZFree,Premium,QuestValue(250)>2,CountMoney>=120,! -> Price=120, "Set the sails %N!", Queue, DeleteMoney, EffectOpp(11), Teleport(32954,32023,6), EffectOpp(11) +BUSY,"please","bring","me","to","venore",PZFree,Premium,CountMoney>=130,! -> Price=130, "Set the sails %N!", Queue, DeleteMoney, EffectOpp(11), Teleport(32954,32023,6), EffectOpp(11) + BUSY,"hello$",! -> "One moment please %N. You're next in line.", Queue BUSY,"hi$",! -> * BUSY,! -> NOP diff --git a/data/npc/captain3.npc b/data/npc/captain3.npc index 217504a..50dfbf8 100644 --- a/data/npc/captain3.npc +++ b/data/npc/captain3.npc @@ -12,6 +12,21 @@ ADDRESS,"hi$",male,! -> * ADDRESS,"hello$",female,! -> "Welcome on board, Madam %N." ADDRESS,"hi$",female,! -> * ADDRESS,! -> Idle +BUSY,"please","bring","me","to","thais",PZFree,Premium,QuestValue(250)>2,CountMoney>=120,! -> Price=120, "Set the sails %N!", Queue, DeleteMoney, EffectOpp(11), Teleport(32312,32211,6), EffectOpp(11) +BUSY,"please","bring","me","to","thais",PZFree,Premium,CountMoney>=130,! -> Price=130, "Set the sails %N!", Queue, DeleteMoney, EffectOpp(11), Teleport(32312,32211,6), EffectOpp(11) + +BUSY,"please","bring","me","to","carlin",PZFree,Premium,QuestValue(250)>2,CountMoney>=70,! -> Price=70, "Set the sails %N!", Queue, DeleteMoney, EffectOpp(11), Teleport(32387,31821,6), EffectOpp(11) +BUSY,"please","bring","me","to","carlin",PZFree,Premium,CountMoney>=80,! -> Price=80, "Set the sails %N!", Queue, DeleteMoney, EffectOpp(11), Teleport(32387,31821,6), EffectOpp(11) + +BUSY,"please","bring","me","to","ab'dendriel",PZFree,Premium,QuestValue(250)>2,CountMoney>=120,! -> Price=120, "Set the sails %N!", Queue, DeleteMoney, EffectOpp(11), Teleport(32733,31668,6), EffectOpp(11) +BUSY,"please","bring","me","to","ab'dendriel",PZFree,Premium,CountMoney>=130,! -> Price=130, "Set the sails %N!", Queue, DeleteMoney, EffectOpp(11), Teleport(32733,31668,6), EffectOpp(11) + +BUSY,"please","bring","me","to","edron",PZFree,Premium,QuestValue(250)>2,CountMoney>=50,! -> Price=50, "Set the sails %N!", Queue, DeleteMoney, EffectOpp(11), Teleport(33175,31764,6), EffectOpp(11) +BUSY,"please","bring","me","to","edron",PZFree,Premium,CountMoney>=60,! -> Price=60, "Set the sails %N!", Queue, DeleteMoney, EffectOpp(11), Teleport(33175,31764,6), EffectOpp(11) + +BUSY,"please","bring","me","to","venore",PZFree,Premium,QuestValue(250)>2,CountMoney>=70,! -> Price=70, "Set the sails %N!", Queue, DeleteMoney, EffectOpp(11), Teleport(32954,32023,6), EffectOpp(11) +BUSY,"please","bring","me","to","venore",PZFree,Premium,CountMoney>=80,! -> Price=80, "Set the sails %N!", Queue, DeleteMoney, EffectOpp(11), Teleport(32954,32023,6), EffectOpp(11) + BUSY,"hello$",! -> "One moment please %N. You're next in line.", Queue BUSY,"hi$",! -> * BUSY,! -> NOP diff --git a/data/npc/captain4.npc b/data/npc/captain4.npc index fc596fe..f65036c 100644 --- a/data/npc/captain4.npc +++ b/data/npc/captain4.npc @@ -12,6 +12,30 @@ ADDRESS,"hi$",male,! -> * ADDRESS,"hello$",female,! -> "Welcome on board, Madam %N." ADDRESS,"hi$",female,! -> * ADDRESS,! -> Idle +BUSY,"please","bring","me","to","thais",PZFree,Premium,QuestValue(250)>2,CountMoney>=150,! -> Price=150, "Set the sails %N!", Queue, DeleteMoney, EffectOpp(11), Teleport(32312,32211,6), EffectOpp(11) +BUSY,"please","bring","me","to","thais",PZFree,Premium,CountMoney>=160,! -> Price=160, "Set the sails %N!", Queue, DeleteMoney, EffectOpp(11), Teleport(32312,32211,6), EffectOpp(11) + +BUSY,"please","bring","me","to","carlin",PZFree,Premium,QuestValue(250)>2,CountMoney>=100,! -> Price=100, "Set the sails %N!", Queue, DeleteMoney, EffectOpp(11), Teleport(32387,31821,6), EffectOpp(11) +BUSY,"please","bring","me","to","carlin",PZFree,Premium,CountMoney>=110,! -> Price=110, "Set the sails %N!", Queue, DeleteMoney, EffectOpp(11), Teleport(32387,31821,6), EffectOpp(11) + +BUSY,"please","bring","me","to","ab'dendriel",PZFree,Premium,QuestValue(250)>2,CountMoney>=60,! -> Price=60, "Set the sails %N!", Queue, DeleteMoney, EffectOpp(11), Teleport(32733,31668,6), EffectOpp(11) +BUSY,"please","bring","me","to","ab'dendriel",PZFree,Premium,CountMoney>=70,! -> Price=70, "Set the sails %N!", Queue, DeleteMoney, EffectOpp(11), Teleport(32733,31668,6), EffectOpp(11) + +BUSY,"please","bring","me","to","cormaya",PZFree,Premium,QuestValue(250)>2,CountMoney>=10,! -> Price=10, "Set the sails %N!", Queue, DeleteMoney, EffectOpp(11), Teleport(33288,31956,6), EffectOpp(11) +BUSY,"please","bring","me","to","cormaya",PZFree,Premium,CountMoney>=20,! -> Price=20, "Set the sails %N!", Queue, DeleteMoney, EffectOpp(11), Teleport(33288,31956,6), EffectOpp(11) + +BUSY,"please","bring","me","to","venore",PZFree,Premium,QuestValue(250)>2,CountMoney>=30,! -> Price=30, "Set the sails %N!", Queue, DeleteMoney, EffectOpp(11), Teleport(32954,32023,6), EffectOpp(11) +BUSY,"please","bring","me","to","venore",PZFree,Premium,CountMoney>=40,! -> Price=40, "Set the sails %N!", Queue, DeleteMoney, EffectOpp(11), Teleport(32954,32023,6), EffectOpp(11) + +BUSY,"please","bring","me","to","ankrahmun",PZFree,Premium,QuestValue(250)>2,CountMoney>=150,! -> Price=150, "Set the sails %N!", Queue, DeleteMoney, EffectOpp(11), Teleport(33091,32883,6), EffectOpp(11) +BUSY,"please","bring","me","to","ankrahmun",PZFree,Premium,CountMoney>=160,! -> Price=160, "Set the sails %N!", Queue, DeleteMoney, EffectOpp(11), Teleport(33091,32883,6), EffectOpp(11) + +BUSY,"please","bring","me","to","port","hope",PZFree,Premium,QuestValue(250)>2,CountMoney>=140,! -> Price=140, "Set the sails %N!", Queue, DeleteMoney, EffectOpp(11), Teleport(32530,32784,6), EffectOpp(11) +BUSY,"please","bring","me","to","port","hope",PZFree,Premium,CountMoney>=150,! -> Price=150, "Set the sails %N!", Queue, DeleteMoney, EffectOpp(11), Teleport(32530,32784,6), EffectOpp(11) + +BUSY,"please","bring","me","to","liberty","bay",PZFree,Premium,QuestValue(250)>2,CountMoney>=160,! -> Price=160, "Set the sails %N!", Queue, DeleteMoney, EffectOpp(11), Teleport(32285,32892,6), EffectOpp(11) +BUSY,"please","bring","me","to","liberty","bay",PZFree,Premium,CountMoney>=170,! -> Price=170, "Set the sails %N!", Queue, DeleteMoney, EffectOpp(11), Teleport(32285,32892,6), EffectOpp(11) + BUSY,"hello$",! -> "One moment please %N. You're next in line.", Queue BUSY,"hi$",! -> * BUSY,! -> NOP diff --git a/data/npc/captain5.npc b/data/npc/captain5.npc index ead2b47..bde7e78 100644 --- a/data/npc/captain5.npc +++ b/data/npc/captain5.npc @@ -12,6 +12,29 @@ ADDRESS,"hi$",male,! -> * ADDRESS,"hello$",female,! -> "Welcome on board, Madam %N." ADDRESS,"hi$",female,! -> * ADDRESS,! -> Idle +BUSY,"please","bring","me","to","thais",PZFree,Premium,QuestValue(250)>2,CountMoney>=160,! -> Price=160, "Set the sails %N!", Queue, DeleteMoney, EffectOpp(11), Teleport(32312,32211,6), EffectOpp(11) +BUSY,"please","bring","me","to","thais",PZFree,Premium,CountMoney>=170,! -> Price=170, "Set the sails %N!", Queue, DeleteMoney, EffectOpp(11), Teleport(32312,32211,6), EffectOpp(11) + +BUSY,"please","bring","me","to","carlin",PZFree,Premium,QuestValue(250)>2,CountMoney>=120,! -> Price=120, "Set the sails %N!", Queue, DeleteMoney, EffectOpp(11), Teleport(32387,31821,6), EffectOpp(11) +BUSY,"please","bring","me","to","carlin",PZFree,Premium,CountMoney>=130,! -> Price=130, "Set the sails %N!", Queue, DeleteMoney, EffectOpp(11), Teleport(32387,31821,6), EffectOpp(11) + +BUSY,"please","bring","me","to","ab'dendriel",PZFree,Premium,QuestValue(250)>2,CountMoney>=80,! -> Price=80, "Set the sails %N!", Queue, DeleteMoney, EffectOpp(11), Teleport(32733,31668,6), EffectOpp(11) +BUSY,"please","bring","me","to","ab'dendriel",PZFree,Premium,CountMoney>=90,! -> Price=90, "Set the sails %N!", Queue, DeleteMoney, EffectOpp(11), Teleport(32733,31668,6), EffectOpp(11) + +BUSY,"please","bring","me","to","edron",PZFree,Premium,QuestValue(250)>2,CountMoney>=30,! -> Price=30, "Set the sails %N!", Queue, DeleteMoney, EffectOpp(11), Teleport(33175,31764,6), EffectOpp(11) +BUSY,"please","bring","me","to","edron",PZFree,Premium,CountMoney>=40,! -> Price=40, "Set the sails %N!", Queue, DeleteMoney, EffectOpp(11), Teleport(33175,31764,6), EffectOpp(11) + +BUSY,"please","bring","me","to","darashia",! -> "One moment please %N. I want to warn you about this trip.", Queue + +BUSY,"please","bring","me","to","ankrahmun",PZFree,Premium,QuestValue(250)>2,CountMoney>=140,! -> Price=140, "Set the sails %N!", Queue, DeleteMoney, EffectOpp(11), Teleport(33091,32883,6), EffectOpp(11) +BUSY,"please","bring","me","to","ankrahmun",PZFree,Premium,CountMoney>=150,! -> Price=150, "Set the sails %N!", Queue, DeleteMoney, EffectOpp(11), Teleport(33091,32883,6), EffectOpp(11) + +BUSY,"please","bring","me","to","port","hope",PZFree,Premium,QuestValue(250)>2,CountMoney>=150,! -> Price=150, "Set the sails %N!", Queue, DeleteMoney, EffectOpp(11), Teleport(32530,32784,6), EffectOpp(11) +BUSY,"please","bring","me","to","port","hope",PZFree,Premium,CountMoney>=160,! -> Price=160, "Set the sails %N!", Queue, DeleteMoney, EffectOpp(11), Teleport(32530,32784,6), EffectOpp(11) + +BUSY,"please","bring","me","to","liberty","bay",PZFree,Premium,QuestValue(250)>2,CountMoney>=170,! -> Price=170, "Set the sails %N!", Queue, DeleteMoney, EffectOpp(11), Teleport(32285,32892,6), EffectOpp(11) +BUSY,"please","bring","me","to","liberty","bay",PZFree,Premium,CountMoney>=180,! -> Price=180, "Set the sails %N!", Queue, DeleteMoney, EffectOpp(11), Teleport(32285,32892,6), EffectOpp(11) + BUSY,"hello$",! -> "One moment please %N. You're next in line", Queue BUSY,"hi$",! -> * BUSY,! -> NOP diff --git a/data/npc/captain6.npc b/data/npc/captain6.npc index 0027f84..5c57512 100644 --- a/data/npc/captain6.npc +++ b/data/npc/captain6.npc @@ -10,6 +10,18 @@ Behaviour = { ADDRESS,"hello$",! -> "Greetings, %N. I can take you to Venore, Port Hope or Ankrahmun if you like." ADDRESS,"hi$",! -> * ADDRESS,! -> Idle +BUSY,"please","bring","me","to","venore",PZFree,Premium,QuestValue(250)>2,CountMoney>=160,! -> Price=160, "Set the sails %N!", Queue, DeleteMoney, EffectOpp(11), Teleport(32954,32023,6), EffectOpp(11) +BUSY,"please","bring","me","to","venore",PZFree,Premium,CountMoney>=170,! -> Price=170, "Set the sails %N!", Queue, DeleteMoney, EffectOpp(11), Teleport(32954,32023,6), EffectOpp(11) + +BUSY,"please","bring","me","to","ankrahmun",PZFree,Premium,QuestValue(250)>2,CountMoney>=90,! -> Price=90, "Set the sails %N!", Queue, DeleteMoney, EffectOpp(11), Teleport(33091,32883,6), EffectOpp(11) +BUSY,"please","bring","me","to","ankrahmun",PZFree,Premium,CountMoney>=100,! -> Price=100, "Set the sails %N!", Queue, DeleteMoney, EffectOpp(11), Teleport(33091,32883,6), EffectOpp(11) + +BUSY,"please","bring","me","to","port","hope",PZFree,Premium,QuestValue(250)>2,CountMoney>=170,! -> Price=170, "Set the sails %N!", Queue, DeleteMoney, EffectOpp(11), Teleport(32530,32784,6), EffectOpp(11) +BUSY,"please","bring","me","to","port","hope",PZFree,Premium,CountMoney>=180,! -> Price=180, "Set the sails %N!", Queue, DeleteMoney, EffectOpp(11), Teleport(32530,32784,6), EffectOpp(11) + +BUSY,"please","bring","me","to","liberty","bay",PZFree,Premium,QuestValue(250)>2,CountMoney>=190,! -> Price=190, "Set the sails %N!", Queue, DeleteMoney, EffectOpp(11), Teleport(32285,32892,6), EffectOpp(11) +BUSY,"please","bring","me","to","liberty","bay",PZFree,Premium,CountMoney>=200,! -> Price=200, "Set the sails %N!", Queue, DeleteMoney, EffectOpp(11), Teleport(32285,32892,6), EffectOpp(11) + BUSY,"hello$",! -> "One moment please, %N.", Queue BUSY,"hi$",! -> * BUSY,! -> NOP diff --git a/data/npc/captain7.npc b/data/npc/captain7.npc index fbf941e..5f66015 100644 --- a/data/npc/captain7.npc +++ b/data/npc/captain7.npc @@ -12,6 +12,21 @@ ADDRESS,"hi$",male,! -> * ADDRESS,"hello$",female,! -> "Welcome on board, Madam %N." ADDRESS,"hi$",female,! -> * ADDRESS,! -> Idle +BUSY,"please","bring","me","to","darashia",PZFree,Premium,QuestValue(250)>2,CountMoney>=90,! -> Price=90, "Set the sails %N!", Queue, DeleteMoney, EffectOpp(11), Teleport(33290,32481,6), EffectOpp(11) +BUSY,"please","bring","me","to","darashia",PZFree,Premium,CountMoney>=100,! -> Price=100, "Set the sails %N!", Queue, DeleteMoney, EffectOpp(11), Teleport(33290,32481,6), EffectOpp(11) + +BUSY,"please","bring","me","to","edron",PZFree,Premium,QuestValue(250)>2,CountMoney>=150,! -> Price=150, "Set the sails %N!", Queue, DeleteMoney, EffectOpp(11), Teleport(33175,31764,6), EffectOpp(11) +BUSY,"please","bring","me","to","edron",PZFree,Premium,CountMoney>=160,! -> Price=160, "Set the sails %N!", Queue, DeleteMoney, EffectOpp(11), Teleport(33175,31764,6), EffectOpp(11) + +BUSY,"please","bring","me","to","venore",PZFree,Premium,QuestValue(250)>2,CountMoney>=140,! -> Price=140, "Set the sails %N!", Queue, DeleteMoney, EffectOpp(11), Teleport(32954,32023,6), EffectOpp(11) +BUSY,"please","bring","me","to","venore",PZFree,Premium,CountMoney>=150,! -> Price=150, "Set the sails %N!", Queue, DeleteMoney, EffectOpp(11), Teleport(32954,32023,6), EffectOpp(11) + +BUSY,"please","bring","me","to","port","hope",PZFree,Premium,QuestValue(250)>2,CountMoney>=70,! -> Price=70, "Set the sails %N!", Queue, DeleteMoney, EffectOpp(11), Teleport(32530,32784,6), EffectOpp(11) +BUSY,"please","bring","me","to","port","hope",PZFree,Premium,CountMoney>=80,! -> Price=80, "Set the sails %N!", Queue, DeleteMoney, EffectOpp(11), Teleport(32530,32784,6), EffectOpp(11) + +BUSY,"please","bring","me","to","liberty","bay",PZFree,Premium,QuestValue(250)>2,CountMoney>=80,! -> Price=80, "Set the sails %N!", Queue, DeleteMoney, EffectOpp(11), Teleport(32285,32892,6), EffectOpp(11) +BUSY,"please","bring","me","to","liberty","bay",PZFree,Premium,CountMoney>=90,! -> Price=90, "Set the sails %N!", Queue, DeleteMoney, EffectOpp(11), Teleport(32285,32892,6), EffectOpp(11) + BUSY,"hello$",! -> "One moment please %N. You're next in line.", Queue BUSY,"hi$",! -> * BUSY,! -> NOP diff --git a/data/npc/captainwaveriderisland.npc b/data/npc/captainwaveriderisland.npc index f650003..93b1129 100644 --- a/data/npc/captainwaveriderisland.npc +++ b/data/npc/captainwaveriderisland.npc @@ -9,6 +9,8 @@ Behaviour = { ADDRESS,"hello$",! -> "Greetings, daring adventurer. If you need a passage, let me know." ADDRESS,"hi$",! -> * ADDRESS,! -> Idle +BUSY,"please","bring","me","to","liberty","bay",PZFree,Premium,CountMoney>=50,! -> Price=50, "Set the sails %N!", Queue, DeleteMoney, EffectOpp(11), Teleport(32349,32856,7), EffectOpp(11) + BUSY,"hello$",! -> "One moment please %N. You're next in line.", Queue BUSY,"hi$",! -> * BUSY,! -> NOP @@ -21,7 +23,7 @@ VANISH,! -> "Oh well." "sail" -> "Where do you want to go? To Liberty bay?" "passage" -> * -"liberty bay" -> Price=50, "Do you seek a passage to Liberty bay for %P?", Topic=1 +"liberty","bay" -> Price=50, "Do you seek a passage to Liberty bay for %P?", Topic=1 "back" -> * "return" -> * diff --git a/data/npc/captainwaveriderlibertybay.npc b/data/npc/captainwaveriderlibertybay.npc index 8ae039c..4aaa411 100644 --- a/data/npc/captainwaveriderlibertybay.npc +++ b/data/npc/captainwaveriderlibertybay.npc @@ -9,6 +9,9 @@ Behaviour = { ADDRESS,"hello$",! -> "Greetings, daring adventurer. If you need a passage, let me know." ADDRESS,"hi$",! -> * ADDRESS,! -> Idle +BUSY,"please","bring","me","to","peg","leg",PZFree,Premium,QuestValue(17502)>5,CountMoney>=50,! -> Price=50, "Set the sails %N!", Queue, DeleteMoney, EffectOpp(11), Teleport(32348,32625,7), EffectOpp(11) +BUSY,"please","bring","me","to","treasure","island",PZFree,Premium,CountMoney>=200,! -> Price=200, "Set the sails %N!", Queue, DeleteMoney, EffectOpp(11), Teleport(32132,32913,7), EffectOpp(11) + BUSY,"hello$",! -> "One moment please %N. You're next in line.", Queue BUSY,"hi$",! -> * BUSY,! -> NOP diff --git a/data/npc/charles.npc b/data/npc/charles.npc index f1666f3..d381fe0 100644 --- a/data/npc/charles.npc +++ b/data/npc/charles.npc @@ -11,6 +11,23 @@ ADDRESS,"hello$",! -> "Ahoi." ADDRESS,"hi$",! -> * ADDRESS,"hiho$",! -> * ADDRESS,! -> Idle +BUSY,"please","bring","me","to","thais",PZFree,Premium,QuestValue(250)>2,CountMoney>=150,! -> Price=150, "Set the sails %N!", Queue, DeleteMoney, EffectOpp(11), Teleport(32312,32211,6), EffectOpp(11) +BUSY,"please","bring","me","to","thais",PZFree,Premium,CountMoney>=160,! -> Price=160, "Set the sails %N!", Queue, DeleteMoney, EffectOpp(11), Teleport(32312,32211,6), EffectOpp(11) + +BUSY,"please","bring","me","to","darashia",PZFree,Premium,QuestValue(250)>2,CountMoney>=170,! -> Price=170, "Set the sails %N!", Queue, DeleteMoney, EffectOpp(11), Teleport(33290,32481,6), EffectOpp(11) +BUSY,"please","bring","me","to","darashia",PZFree,Premium,CountMoney>=180,! -> Price=180, "Set the sails %N!", Queue, DeleteMoney, EffectOpp(11), Teleport(33290,32481,6), EffectOpp(11) + +BUSY,"please","bring","me","to","edron",PZFree,Premium,QuestValue(250)>2,CountMoney>=140,! -> Price=140, "Set the sails %N!", Queue, DeleteMoney, EffectOpp(11), Teleport(33175,31764,6), EffectOpp(11) +BUSY,"please","bring","me","to","edron",PZFree,Premium,CountMoney>=150,! -> Price=150, "Set the sails %N!", Queue, DeleteMoney, EffectOpp(11), Teleport(33175,31764,6), EffectOpp(11) + +BUSY,"please","bring","me","to","venore",PZFree,Premium,QuestValue(250)>2,CountMoney>=150,! -> Price=150, "Set the sails %N!", Queue, DeleteMoney, EffectOpp(11), Teleport(32954,32023,6), EffectOpp(11) +BUSY,"please","bring","me","to","venore",PZFree,Premium,CountMoney>=160,! -> Price=160, "Set the sails %N!", Queue, DeleteMoney, EffectOpp(11), Teleport(32954,32023,6), EffectOpp(11) + +BUSY,"please","bring","me","to","ankrahmun",PZFree,Premium,QuestValue(250)>2,CountMoney>=100,! -> Price=100, "Set the sails %N!", Queue, DeleteMoney, EffectOpp(11), Teleport(33091,32883,6), EffectOpp(11) +BUSY,"please","bring","me","to","ankrahmun",PZFree,Premium,CountMoney>=110,! -> Price=110, "Set the sails %N!", Queue, DeleteMoney, EffectOpp(11), Teleport(33091,32883,6), EffectOpp(11) + +BUSY,"please","bring","me","to","liberty","bay",PZFree,Premium,QuestValue(250)>2,CountMoney>=40,! -> Price=40, "Set the sails %N!", Queue, DeleteMoney, EffectOpp(11), Teleport(32285,32892,6), EffectOpp(11) +BUSY,"please","bring","me","to","liberty","bay",PZFree,Premium,CountMoney>=50,! -> Price=50, "Set the sails %N!", Queue, DeleteMoney, EffectOpp(11), Teleport(32285,32892,6), EffectOpp(11) BUSY,"hello$",! -> "Just wait.", Queue BUSY,"hi$",! -> * diff --git a/data/npc/chemar.npc b/data/npc/chemar.npc index e380b06..d096a1b 100644 --- a/data/npc/chemar.npc +++ b/data/npc/chemar.npc @@ -10,6 +10,12 @@ Behaviour = { ADDRESS,"hello$",! -> "Ah, the wind brings in another visitor. Feel welcome %N." ADDRESS,"hi$",! -> * ADDRESS,! -> Idle +BUSY,"please","bring","me","to","edron",PZFree,Premium,QuestValue(250)>2,CountMoney>=20,! -> Price=20, "Hold on %N!", Queue, DeleteMoney, EffectOpp(11), Teleport(33193,31784,3), EffectOpp(11) +BUSY,"please","bring","me","to","edron",PZFree,Premium,CountMoney>=30,! -> Price=30, "Hold on %N!", Queue, DeleteMoney, EffectOpp(11), Teleport(33193,31784,3), EffectOpp(11) + +BUSY,"please","bring","me","to","femor",PZFree,Premium,QuestValue(250)>2,CountMoney>=50,! -> Price=50, "Hold on %N!", Queue, DeleteMoney, EffectOpp(11), Teleport(32535,31837,4), EffectOpp(11) +BUSY,"please","bring","me","to","femor",PZFree,Premium,CountMoney>=60,! -> Price=60, "Hold on %N!", Queue, DeleteMoney, EffectOpp(11), Teleport(32535,31837,4), EffectOpp(11) + BUSY,"hello$",! -> "%N! Be calm as the eye of the storm, and your patience will be rewarded.", Queue BUSY,"hi$",! -> * BUSY,! -> NOP diff --git a/data/npc/gurbasch.npc b/data/npc/gurbasch.npc index 1a04121..6603afb 100644 --- a/data/npc/gurbasch.npc +++ b/data/npc/gurbasch.npc @@ -11,6 +11,8 @@ ADDRESS,"hello$",! -> "Welcome, %N!" ADDRESS,"hi$",! -> * ADDRESS,"hiho$",! -> * ADDRESS,! -> Idle +BUSY,"please","bring","me","to","kazordoon",PZFree,Premium,QuestValue(250)>2,CountMoney>=150,! -> Price=150, "Full steam ahead %N!", Queue, DeleteMoney, EffectOpp(3), Teleport(32658,31957,15), EffectOpp(3) +BUSY,"please","bring","me","to","kazordoon",PZFree,Premium,CountMoney>=160,! -> Price=160, "Full steam ahead %N!", Queue, DeleteMoney, EffectOpp(3), Teleport(32658,31957,15), EffectOpp(3) BUSY,"hello$",! -> "Don't hurry.", Queue BUSY,"hi$",! -> * BUSY,"hiho$",! -> * diff --git a/data/npc/jackfategoroma.npc b/data/npc/jackfategoroma.npc index b45a813..736e718 100644 --- a/data/npc/jackfategoroma.npc +++ b/data/npc/jackfategoroma.npc @@ -11,6 +11,8 @@ ADDRESS,"hi$",male,! -> * ADDRESS,"hello$",female,! -> "Welcome on board, Madam %N." ADDRESS,"hi$",female,! -> * ADDRESS,! -> Idle +BUSY,"please","bring","me","to","liberty","bay",PZFree,Premium,QuestValue(17501)<2,! -> "One moment please %N. I want to warn you about this trip.", Queue +BUSY,"please","bring","me","to","liberty","bay",PZFree,Premium,QuestValue(17501)=2,! -> "Set the sails %N!", Queue, EffectOpp(11), Teleport(32285,32892,6), EffectOpp(11) BUSY,"hello$",! -> "One moment please %N. You're next in line.", Queue BUSY,"hi$",! -> * BUSY,! -> NOP @@ -45,7 +47,8 @@ VANISH,! -> "Good bye. Recommend us, if you were satisfied with "sail",QuestValue(17501)=1 -> * "go",QuestValue(17501)=1 -> * "back",QuestValue(17501)=1 -> * -"liberty","bay",QuestValue(17501)=1 -> * +"liberty","bay",QuestValue(17501)=1 -> * +"wood",QuestValue(17501)=1 -> * "trip",QuestValue(17501)>1 -> "Do you want to travel back to Liberty Bay?", Topic=4 "passage",QuestValue(17501)>1 -> * diff --git a/data/npc/jackfatelibertybay.npc b/data/npc/jackfatelibertybay.npc index aebe8e1..ccefa43 100644 --- a/data/npc/jackfatelibertybay.npc +++ b/data/npc/jackfatelibertybay.npc @@ -11,11 +11,25 @@ ADDRESS,"hi$",male,! -> * ADDRESS,"hello$",female,! -> "Welcome on board, Madam %N." ADDRESS,"hi$",female,! -> * ADDRESS,! -> Idle -BUSY,"please","bring","me","to","thais",QuestValue(17501)<2,! -> "One moment please %N. I want to warn you about this trip.", Queue -BUSY,"please","bring","me","to","thais",QuestValue(17501)=2,! -> Price=180, "Set the sails %N!", Queue, DeleteMoney, EffectOpp(11), Teleport(32312,32211,6), EffectOpp(11) -BUSY,"please","bring","me","to","thais",QuestValue(17501)=2,QuestValue(250)>2,! -> Price=170, "Set the sails %N!", Queue, DeleteMoney, EffectOpp(11), Teleport(32312,32211,6), EffectOpp(11) -BUSY,"please","bring","me","to","darashia",QuestValue(250)>2,! -> Price=190, "Set the sails %N!", Queue, DeleteMoney, EffectOpp(11), Teleport(33290,32481,6), EffectOpp(11) -BUSY,"please","bring","me","to","darashia",! -> Price=200, "Set the sails %N!", Queue, DeleteMoney, EffectOpp(11), Teleport(33290,32481,6), EffectOpp(11) +BUSY,"please","bring","me","to","thais",PZFree,Premium,QuestValue(17501)<2,! -> "One moment please %N. I want to warn you about this trip.", Queue +BUSY,"please","bring","me","to","thais",PZFree,Premium,QuestValue(17501)=2,CountMoney>=180,! -> Price=180, "Set the sails %N!", Queue, DeleteMoney, EffectOpp(11), Teleport(32312,32211,6), EffectOpp(11) +BUSY,"please","bring","me","to","thais",PZFree,Premium,QuestValue(17501)=2,QuestValue(250)>2,CountMoney>=170,! -> Price=170, "Set the sails %N!", Queue, DeleteMoney, EffectOpp(11), Teleport(32312,32211,6), EffectOpp(11) + +BUSY,"please","bring","me","to","darashia",PZFree,Premium,QuestValue(250)>2,CountMoney>=190,! -> Price=190, "Set the sails %N!", Queue, DeleteMoney, EffectOpp(11), Teleport(33290,32481,6), EffectOpp(11) +BUSY,"please","bring","me","to","darashia",PZFree,Premium,CountMoney>=200,! -> Price=200, "Set the sails %N!", Queue, DeleteMoney, EffectOpp(11), Teleport(33290,32481,6), EffectOpp(11) + +BUSY,"please","bring","me","to","edron",PZFree,Premium,QuestValue(250)>2,CountMoney>=160,! -> Price=160, "Set the sails %N!", Queue, DeleteMoney, EffectOpp(11), Teleport(33175,31764,6), EffectOpp(11) +BUSY,"please","bring","me","to","edron",PZFree,Premium,CountMoney>=170,! -> Price=170, "Set the sails %N!", Queue, DeleteMoney, EffectOpp(11), Teleport(33175,31764,6), EffectOpp(11) + +BUSY,"please","bring","me","to","venore",PZFree,Premium,QuestValue(250)>2,CountMoney>=170,! -> Price=170, "Set the sails %N!", Queue, DeleteMoney, EffectOpp(11), Teleport(32954,32023,6), EffectOpp(11) +BUSY,"please","bring","me","to","venore",PZFree,Premium,CountMoney>=180,! -> Price=180, "Set the sails %N!", Queue, DeleteMoney, EffectOpp(11), Teleport(32954,32023,6), EffectOpp(11) + +BUSY,"please","bring","me","to","ankrahmun",PZFree,Premium,QuestValue(250)>2,CountMoney>=80,! -> Price=80, "Set the sails %N!", Queue, DeleteMoney, EffectOpp(11), Teleport(33091,32883,6), EffectOpp(11) +BUSY,"please","bring","me","to","ankrahmun",PZFree,Premium,CountMoney>=90,! -> Price=90, "Set the sails %N!", Queue, DeleteMoney, EffectOpp(11), Teleport(33091,32883,6), EffectOpp(11) + +BUSY,"please","bring","me","to","port","hope",PZFree,Premium,QuestValue(250)>2,CountMoney>=40,! -> Price=40, "Set the sails %N!", Queue, DeleteMoney, EffectOpp(11), Teleport(32530,32784,6), EffectOpp(11) +BUSY,"please","bring","me","to","port","hope",PZFree,Premium,CountMoney>=50,! -> Price=50, "Set the sails %N!", Queue, DeleteMoney, EffectOpp(11), Teleport(32530,32784,6), EffectOpp(11) + BUSY,"hello$",! -> "One moment please %N. You're next in line.", Queue BUSY,"hi$",! -> * BUSY,! -> NOP diff --git a/data/npc/pemaret.npc b/data/npc/pemaret.npc index 9294831..000517c 100644 --- a/data/npc/pemaret.npc +++ b/data/npc/pemaret.npc @@ -12,6 +12,11 @@ ADDRESS,"hi$",male,! -> * ADDRESS,"hello$",female,! -> "Greetings, young lady. Looking for a passage or some fish, %N?" ADDRESS,"hi$",female,! -> * ADDRESS,! -> Idle +BUSY,"please","bring","me","to","edron",PZFree,Premium,QuestValue(250)>2,CountMoney>=10,! -> Price=10, "Here we go %N!", Queue, DeleteMoney, EffectOpp(11), Teleport(33175,31764,6), EffectOpp(11) +BUSY,"please","bring","me","to","edron",PZFree,Premium,CountMoney>=20,! -> Price=20, "Here we go %N!", Queue, DeleteMoney, EffectOpp(11), Teleport(33175,31764,6), EffectOpp(11) + +BUSY,"please","bring","me","to","eremo",PZFree,Premium,! -> "Here we go %N!", Queue, EffectOpp(11), Teleport(33315,31882,7), EffectOpp(11) + BUSY,"hello$",! -> "One moment please, %N.", Queue BUSY,"hi$",! -> * BUSY,! -> NOP diff --git a/data/npc/pino.npc b/data/npc/pino.npc index 3755506..8a9cab1 100644 --- a/data/npc/pino.npc +++ b/data/npc/pino.npc @@ -10,6 +10,12 @@ Behaviour = { ADDRESS,"hello$",! -> "Greetings, traveller %N." ADDRESS,"hi$",! -> * ADDRESS,! -> Idle +BUSY,"please","bring","me","to","femor",PZFree,Premium,QuestValue(250)>2,CountMoney>=50,! -> Price=50, "Hold on %N!", Queue, DeleteMoney, EffectOpp(11), Teleport(32535,31837,4), EffectOpp(11) +BUSY,"please","bring","me","to","femor",PZFree,Premium,CountMoney>=60,! -> Price=60, "Hold on %N!", Queue, DeleteMoney, EffectOpp(11), Teleport(32535,31837,4), EffectOpp(11) + +BUSY,"please","bring","me","to","darashia",PZFree,Premium,QuestValue(250)>2,CountMoney>=20,! -> Price=20, "Hold on %N!", Queue, DeleteMoney, EffectOpp(11), Teleport(33269,32441,6), EffectOpp(11) +BUSY,"please","bring","me","to","darashia",PZFree,Premium,CountMoney>=30,! -> Price=30, "Hold on %N!", Queue, DeleteMoney, EffectOpp(11), Teleport(33269,32441,6), EffectOpp(11) + BUSY,"hello$",! -> "Please wait, %N.", Queue BUSY,"hi$",! -> * BUSY,! -> NOP diff --git a/data/npc/sebastianmeriana.npc b/data/npc/sebastianmeriana.npc index 944b765..5a081a0 100644 --- a/data/npc/sebastianmeriana.npc +++ b/data/npc/sebastianmeriana.npc @@ -9,6 +9,9 @@ Behaviour = { ADDRESS,"hello$",! -> "Ho, %N." ADDRESS,"hi$",! -> * ADDRESS,! -> Idle +BUSY,"please","bring","me","to","nargor",PZFree,Premium,QuestValue(17520)>3,CountMoney>=50,! -> Price=50, "Set the sails %N!", Queue, DeleteMoney, EffectOpp(11), Teleport(32025,32812,7), EffectOpp(11) +BUSY,"please","bring","me","to","liberty","bay",PZFree,Premium,CountMoney>=50,! -> Price=50, "Set the sails %N!", Queue, DeleteMoney, EffectOpp(11), Teleport(32316,32702,7), EffectOpp(11) + BUSY,"hello$",! -> "One moment please %N. You're next in line.", Queue BUSY,"hi$",! -> * BUSY,! -> NOP @@ -22,7 +25,7 @@ VANISH,! -> "Hm." "passage" -> * "meriana" -> "Yes. We are in Meriana." -"liberty bay" -> Price=50, "Do you seek a passage to Liberty Bay for %P?", Topic=1 +"liberty","bay" -> Price=50, "Do you seek a passage to Liberty Bay for %P?", Topic=1 "nargor",QuestValue(17520)<4 -> "Sorry, but you have to get permission from the Raymond Striker if you wan't to sail to Nargor." "nargor" -> Price=50, "Do you seek a passage to Nargor for %P?", Topic=2 diff --git a/data/npc/sebastiannargor.npc b/data/npc/sebastiannargor.npc index 5c37eb0..e455a8d 100644 --- a/data/npc/sebastiannargor.npc +++ b/data/npc/sebastiannargor.npc @@ -9,6 +9,8 @@ Behaviour = { ADDRESS,"hello$",! -> "Ho, %N." ADDRESS,"hi$",! -> * ADDRESS,! -> Idle +BUSY,"please","bring","me","to","liberty","bay",PZFree,Premium,CountMoney>=100,! -> Price=100, "Set the sails %N!", Queue, DeleteMoney, EffectOpp(11), Teleport(32316,32702,7), EffectOpp(11) +BUSY,"please","bring","me","to","meriana",PZFree,Premium,CountMoney>=50,! -> Price=50, "Set the sails %N!", Queue, DeleteMoney, EffectOpp(11), Teleport(32346,32625,7), EffectOpp(11) BUSY,"hello$",! -> "One moment please %N. You're next in line.", Queue BUSY,"hi$",! -> * BUSY,! -> NOP @@ -22,7 +24,7 @@ VANISH,! -> "Hm." "passage" -> * "nargor" -> "Yes. We are in Nargor." -"liberty bay" -> Price=100, "Do you seek a passage to Liberty Bay for %P?", Topic=1 +"liberty","bay" -> Price=100, "Do you seek a passage to Liberty Bay for %P?", Topic=1 "meriana" -> Price=50, "Do you seek a passage to Meriana for %P?", Topic=2 Topic=1,"yes",PZBlock,! -> "First get rid of those blood stains! You are not going to ruin my vehicle!" diff --git a/data/npc/uzon.npc b/data/npc/uzon.npc index 2833d91..16fbf2d 100644 --- a/data/npc/uzon.npc +++ b/data/npc/uzon.npc @@ -10,6 +10,12 @@ Behaviour = { ADDRESS,"hello$",! -> "Daraman's blessings, traveller %N." ADDRESS,"hi$",! -> * ADDRESS,! -> Idle +BUSY,"please","bring","me","to","darashia",PZFree,Premium,QuestValue(250)>2,CountMoney>=50,! -> Price=50, "Hold on %N!", Queue, DeleteMoney, EffectOpp(11), Teleport(33269,32441,6), EffectOpp(11) +BUSY,"please","bring","me","to","darashia",PZFree,Premium,CountMoney>=60,! -> Price=60, "Hold on %N!", Queue, DeleteMoney, EffectOpp(11), Teleport(33269,32441,6), EffectOpp(11) + +BUSY,"please","bring","me","to","edron",PZFree,Premium,QuestValue(250)>2,CountMoney>=60,! -> Price=60, "Hold on %N!", Queue, DeleteMoney, EffectOpp(11), Teleport(33193,31784,3), EffectOpp(11) +BUSY,"please","bring","me","to","edron",PZFree,Premium,CountMoney>=60,! -> Price=60, "Hold on %N!", Queue, DeleteMoney, EffectOpp(11), Teleport(33193,31784,3), EffectOpp(11) + BUSY,"hello$",! -> "Hastiness is not the way of the people of Darama, %N. Give me the time I need here.", Queue BUSY,"hi$",! -> * BUSY,! -> NOP diff --git a/src/behaviourdatabase.cpp b/src/behaviourdatabase.cpp index f998694..416559a 100644 --- a/src/behaviourdatabase.cpp +++ b/src/behaviourdatabase.cpp @@ -151,6 +151,9 @@ bool BehaviourDatabase::loadConditions(ScriptReader& script, NpcBehaviour* behav } else if (identifier == "pzblock") { condition->type = BEHAVIOUR_TYPE_PZLOCKED; searchTerm = true; + } else if (identifier == "pzfree") { + condition->type = BEHAVIOUR_TYPE_PZFREE; + searchTerm = true; } else if (identifier == "promoted") { condition->type = BEHAVIOUR_TYPE_PROMOTED; searchTerm = true; @@ -756,6 +759,11 @@ bool BehaviourDatabase::checkCondition(const NpcBehaviourCondition* condition, P return false; } break; + case BEHAVIOUR_TYPE_PZFREE: + if (player->isPzLocked()) { + return false; + } + break; case BEHAVIOUR_TYPE_PROMOTED: { int32_t value = 0; player->getStorageValue(30018, value); diff --git a/src/behaviourdatabase.h b/src/behaviourdatabase.h index 356615b..72f61d7 100644 --- a/src/behaviourdatabase.h +++ b/src/behaviourdatabase.h @@ -91,6 +91,7 @@ enum NpcBehaviourType_t BEHAVIOUR_TYPE_DELETEAMOUNT, // deletes an item according specified amount BEHAVIOUR_TYPE_EXPIRINGQUESTVALUE, // get/set expiring quest value BEHAVIOUR_TYPE_SLOTITEM, // get slot item + BEHAVIOUR_TYPE_PZFREE, // is player pz not locked }; enum NpcBehaviourOperator_t