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

@@ -11,8 +11,12 @@ 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,"bring","me","to","cormaya",Premium,QuestValue(250)>2,CountMoney>=150,! -> Price=150, "Full steam ahead %N!", Queue, DeleteMoney, EffectOpp(3), Teleport(33309,31989,15), EffectOpp(3)
BUSY,"bring","me","to","cormaya",Premium,CountMoney>=160,! -> Price=160, "Full steam ahead %N!", Queue, DeleteMoney, EffectOpp(3), Teleport(33309,31989,15), EffectOpp(3)
ADDRESS,"bring","me","to","cormaya",Premium,QuestValue(250)>2,CountMoney>=150,! -> Price=150, "Full steam ahead %N!", Queue, DeleteMoney, EffectOpp(3), Teleport(33309,31989,15), EffectOpp(3)
ADDRESS,"bring","me","to","cormaya",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$",! -> *
@@ -56,8 +60,6 @@ VANISH,! -> "Yeah, yeah, walk, it's cheaper."
Topic=1,"yes",PZBlock,! -> "First get rid of those blood stains! You are not going to ruin my vehicle!"
# f<>r post-quest
Topic=1,"yes",Premium,QuestValue(227)=4,CountMoney>=Price -> "Full steam ahead!", DeleteMoney, Idle, EffectOpp(3), Teleport(33309,31989,15), EffectOpp(3),SetQuestValue(227,5)