Resolve "Merge the best from 7.40 branch"

This commit is contained in:
Erikas Kontenis
2022-04-06 14:58:52 +00:00
parent 3bd1a6f07e
commit 155da3573c
928 changed files with 43723 additions and 1221 deletions

View File

@@ -9,8 +9,11 @@ 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,"bring","me","to","nargor",Premium,QuestValue(17520)>3,CountMoney>=50,! -> Price=50, "Set the sails %N!", Queue, DeleteMoney, EffectOpp(11), Teleport(32025,32812,7), EffectOpp(11)
BUSY,"bring","me","to","liberty","bay",Premium,CountMoney>=50,! -> Price=50, "Set the sails %N!", Queue, DeleteMoney, EffectOpp(11), Teleport(32316,32702,7), EffectOpp(11)
ADDRESS,"bring","me","to","nargor",Premium,QuestValue(17520)>3,CountMoney>=50,! -> Price=50, "Set the sails %N!", Queue, DeleteMoney, EffectOpp(11), Teleport(32025,32812,7), EffectOpp(11)
ADDRESS,"bring","me","to","liberty","bay",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$",! -> *
@@ -29,8 +32,6 @@ VANISH,! -> "Hm."
"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
Topic=1,"yes",PZBlock,! -> "First get rid of those blood stains! You are not going to ruin my vehicle!"
Topic=1,"yes",Premium,CountMoney>=Price -> "Set the sails!", DeleteMoney, Idle, EffectOpp(11), Teleport(32316,32702,7), EffectOpp(11)
Topic=2,"yes",Premium,CountMoney>=Price -> "Set the sails!", DeleteMoney, Idle, EffectOpp(11), Teleport(32025,32812,7), EffectOpp(11)