diff options
| author | Andrei Karas <akaras@inbox.ru> | 2013-01-02 18:06:13 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2013-01-02 18:06:13 +0300 |
| commit | 1e6d657b14eb6cdb7a8c8b22f1ad63a54ba43552 (patch) | |
| tree | 7f8f023be511765c31ce7ba0f43834d71013d925 /npc | |
| parent | ce6b3ee50d96a1ba0f0a4b9b264121c5ede1abb6 (diff) | |
| parent | 0733f97179b25ebfdc5581e7c7ccf94e4c7d4882 (diff) | |
| download | clientdata-1e6d657b14eb6cdb7a8c8b22f1ad63a54ba43552.tar.gz clientdata-1e6d657b14eb6cdb7a8c8b22f1ad63a54ba43552.tar.bz2 clientdata-1e6d657b14eb6cdb7a8c8b22f1ad63a54ba43552.tar.xz clientdata-1e6d657b14eb6cdb7a8c8b22f1ad63a54ba43552.zip | |
Merge branch 'master' of gitorious.org:evol/serverdata-beta
Diffstat (limited to 'npc')
| -rw-r--r-- | npc/000-0/sailors.txt | 12 | ||||
| -rw-r--r-- | npc/000-2-0/julia.txt | 25 | ||||
| -rw-r--r-- | npc/000-2-1/arpan.txt | 4 |
3 files changed, 28 insertions, 13 deletions
diff --git a/npc/000-0/sailors.txt b/npc/000-0/sailors.txt index 97277c8a..f99c33c3 100644 --- a/npc/000-0/sailors.txt +++ b/npc/000-0/sailors.txt @@ -25,22 +25,22 @@ OnTouch: mes col(l("Aboard stand sailors trying to communicate with you."), 9); next; - setcam 672,608; + setcamnpc "Sailors",-64,-32; mesn "Orc Voice"; mesq lg("Hey Frenchy!"); next; - setcam 736,608; + setcamnpc "Sailors",0,-32; mesn "Elven Voice"; mesq lg("Why Frenchy? It's a Russian!"); next; - setcam 896,576; + setcamnpc "Sailors",144,-80; mesn "Tritan Voice"; mesq lg("What are you guys saying ? It's a Yoiis!"); next; - setcam 736,640; + setcamnpc; mesn "Raijin Voice"; mesq g(l("You stupid, she's english, look at the shape of her head."), l("You stupid, he's english, look at the shape of his head.")); @@ -64,13 +64,13 @@ OnTouch: if (@lang < 0 || @lang > 9) close; setlang @lang; - setcam 736,608; + setcamnpc; mes ""; mesn; mesq g(l("Oh, she's still alive!"), l("Oh, he's still alive!")); next; - setcam 896,576; + setcamnpc "Sailors",144,-80; mesq g(l("This girl needs help, we need to rescue her!"), l("This guy needs help, we need to rescue him!")); next; diff --git a/npc/000-2-0/julia.txt b/npc/000-2-0/julia.txt index 93d1a235..f51f03bc 100644 --- a/npc/000-2-0/julia.txt +++ b/npc/000-2-0/julia.txt @@ -9,14 +9,27 @@ // Variables: // 0 ShipQuests_Julia // 1 ShipQuests_ChefGado -// Values ShipQuests_Julia: -// 00 Has not talked to Julia -// 01 Need to see Julia -// 02 Has been registered by Julia -// Values ShipQuests_ChefGado: +// 2 ShipQuests_Nard +// Values: +// Julia: +// 10 Default, no quest given. +// 01 Need to see Julia. +// 02 Has been registered by Julia. +// Gado: +// 10 Default, no quest given. +// 11 Quest accepted. // 12 Ingredients collected, ready to poison Julia. // 13 Julia poisoned. -// 15 Quest aborted. +// 14 Quest complete. +// 15 PoisonDish Return. +// 16 Quest aborted. Julia wins. +// Nard: +// 20 Introduction of the boxes and Nard. This is displayed when the player never spoke to Nard or his box. +// 21 Nard spoke and gave access to the outdoor of the ship. +// 22 Completed the Gugli quest. +// 23 ChefGado Quest accepted. +// 24 ChefGado Quest completed and "Introduction" chapter finalized. +// 25 Reward taken from the box. 000-2-0.gat,27,24,0,0 script Julia 304,2,10;5,{ diff --git a/npc/000-2-1/arpan.txt b/npc/000-2-1/arpan.txt index 2e48fe87..118f2561 100644 --- a/npc/000-2-1/arpan.txt +++ b/npc/000-2-1/arpan.txt @@ -149,8 +149,9 @@ l_Menu: l("Who are you?"), l_Who, rif(getq(ShipQuests_ArpanMoney) == 0, l("Where are my old clothes?")), l_WhereOldClothes, rif(!@equipped, lg("What should I do after taking these clothes?")), l_WhatCloth, - rif(!@equipped, l("Thank you, I'll take them and put them on.")), l_Quit; + rif(!@equipped, l("Thank you, I'll take them and put them on.")), l_Quit, l("Nothing, sorry."), l_Quit; + close; l_Where: @@ -195,6 +196,7 @@ l_WhereOldClothes: next; setq ShipQuests_ArpanMoney, 1; + set @q, getq(ShipQuests_Arpan); set zeny, zeny+25; message strcharinfo(0), l("You receive 25 GP!"); |