diff options
| author | shennetsind <ind@henn.et> | 2014-11-03 08:15:05 -0200 |
|---|---|---|
| committer | shennetsind <ind@henn.et> | 2014-11-03 08:15:05 -0200 |
| commit | bee4c9d36f4a27e39cc76dc5d6c5f876ed44a678 (patch) | |
| tree | 79f9aec5171e8aed2d701bf67167f260e05f41db /npc/merchants/coin_exchange.txt | |
| parent | 239d480487e24294975f35ed55f210837ad1088e (diff) | |
| parent | ce3f4bfbe016ea69c855146667ba9bd9e0e2e221 (diff) | |
| download | hercules-bee4c9d36f4a27e39cc76dc5d6c5f876ed44a678.tar.gz hercules-bee4c9d36f4a27e39cc76dc5d6c5f876ed44a678.tar.bz2 hercules-bee4c9d36f4a27e39cc76dc5d6c5f876ed44a678.tar.xz hercules-bee4c9d36f4a27e39cc76dc5d6c5f876ed44a678.zip | |
Merge branch 'master' of github.com:HerculesWS/Hercules
Signed-off-by: shennetsind <ind@henn.et>
Conflicts:
src/map/battle.c
Diffstat (limited to 'npc/merchants/coin_exchange.txt')
| -rw-r--r-- | npc/merchants/coin_exchange.txt | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/npc/merchants/coin_exchange.txt b/npc/merchants/coin_exchange.txt index 160a7e5bc..5a63c5708 100644 --- a/npc/merchants/coin_exchange.txt +++ b/npc/merchants/coin_exchange.txt @@ -16,7 +16,7 @@ // Manuk & Splendide //============================================================ - script ::merchant_13_2 -1,{ - set .@n$, "["+strnpcinfo(1)+"]"; + .@n$ = "["+strnpcinfo(1)+"]"; mes .@n$; if (isequipped(2782) && ep13_2_rhea == 100) { if (!checkweight(1201,1)) { @@ -29,15 +29,15 @@ next; if (strnpcinfo(1) == "Merchant of Manuk") { setarray .@items[2],12342,12343,12348; - set .@Book,11019; //Manuk_Selling_Item - set .@coin,6080; //Manuk_Coin - set .@i, select("View item description:Manuk's Opportunity:Manuk's Courage:Manuk's Faith:Cancel"); + .@Book = 11019; //Manuk_Selling_Item + .@coin = 6080; //Manuk_Coin + .@i = select("View item description:Manuk's Opportunity:Manuk's Courage:Manuk's Faith:Cancel"); } else { setarray .@items[2],12344,12345,12349; - set .@Book,11018; //Splendide_Selling_Item - set .@coin,6081; //Splendide_Coin - set .@i, select("View item description:Buy Pinguicula's Fruit Jam:Buy Luciola's Honey Jam:Buy Cornus' Tears:Do nothing"); + .@Book = 11018; //Splendide_Selling_Item + .@coin = 6081; //Splendide_Coin + .@i = select("View item description:Buy Pinguicula's Fruit Jam:Buy Luciola's Honey Jam:Buy Cornus' Tears:Do nothing"); } mes .@n$; if (.@i == 1) { |