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/re/merchants/catalog.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/re/merchants/catalog.txt')
| -rw-r--r-- | npc/re/merchants/catalog.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/npc/re/merchants/catalog.txt b/npc/re/merchants/catalog.txt index 3ef33e953..01793816a 100644 --- a/npc/re/merchants/catalog.txt +++ b/npc/re/merchants/catalog.txt @@ -18,7 +18,7 @@ moc_para01,22,16,5 script Catalog Magician#catal01 4_M_BIBI,{ mes "- You have too many items. Please make space. -"; close; } - set .@ticket_cost, 200; + .@ticket_cost = 200; mes "[Catalog Magician]"; mes "Look... the Magic Academy"; mes "in Geffen is now directly"; @@ -64,7 +64,7 @@ moc_para01,22,16,5 script Catalog Magician#catal01 4_M_BIBI,{ } else break; } - set .@sell, .@ticket_cost * .@input; + .@sell = .@ticket_cost * .@input; mes "The total number of catalog(s) that you're trying to purchase is " + .@input + " pieces."; mes "It costs " + .@sell + " z."; if (Zeny < .@sell) { |