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

@@ -50,7 +50,6 @@ VANISH,! -> "Bye, bye."
"rod" -> Type=3483, Amount=1, Price=170, "Do you want to buy a fishing rod for %P gold?", Topic=1
"arrow" -> Type=3447, Amount=1, Price=3, "Do you want to buy an arrow for %P gold?", Topic=1
"bolt" -> Type=3446, Amount=1, Price=4, "Do you want to buy a bolt for %P gold?", Topic=1
"power","bolt" -> Type=3450, Amount=1, Price=6, "Do you want to buy a power bolt for %P gold?", Topic=1
"viking","helmet" -> Type=3367, Amount=1, Price=265, "Do you want to buy a viking helmet for %P gold?", Topic=1
%1,1<%1,"torch" -> Type=2920, Amount=%1, Price=3*%1, "Do you want to buy %A torches for %P gold?", Topic=1
@@ -61,7 +60,6 @@ VANISH,! -> "Bye, bye."
%1,1<%1,"rod" -> Type=3483, Amount=%1, Price=170*%1, "Do you want to buy %A fishing rods for %P gold?", Topic=1
%1,1<%1,"arrow" -> Type=3447, Amount=%1, Price=3*%1, "Do you want to buy %A arrows for %P gold?", Topic=1
%1,1<%1,"bolt" -> Type=3446, Amount=%1, Price=4*%1, "Do you want to buy %A bolts for %P gold?", Topic=1
%1,1<%1,"power","bolt" -> Type=3450, Amount=%1, Price=6*%1, "Do you want to buy %A power bolts for %P gold?", Topic=1
%1,1<%1,"viking","helmet" -> Type=3367, Amount=%1, Price=265*%1, "Do you want to buy %A viking helmets for %P gold?", Topic=1
"worm" -> "I sell worms only in sixpacks for 5 gold each, how many sixpacks of worms do you want to buy?"