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/cities/alberta.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/cities/alberta.txt')
| -rw-r--r-- | npc/cities/alberta.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/npc/cities/alberta.txt b/npc/cities/alberta.txt index 232fb5da3..92e249135 100644 --- a/npc/cities/alberta.txt +++ b/npc/cities/alberta.txt @@ -277,7 +277,7 @@ alberta,195,151,2 script Paul 4_M_04,{ } alberta,190,173,4 script Phelix 4_M_03,{ - set .@weight,MaxWeight-Weight; + .@weight = MaxWeight-Weight; mes "[Phelix]"; if ((.@weight) < 10000) { mes "Wait a moment!!"; @@ -297,7 +297,7 @@ alberta,190,173,4 script Phelix 4_M_03,{ next; mes "[Phelix]"; mes "If you're interested in my offer, get me the stuff I mentioned."; - set @event_zelopy,1; + @event_zelopy = 1; close; } else { mes "Hmm.. you want to exchange jellopies for Red Potions or some Carrots eh? Well.. which one?"; @@ -314,7 +314,7 @@ alberta,190,173,4 script Phelix 4_M_03,{ mes "Hey! Weren't you listening?. I said 10 jellopies for 1 Red Potion.. are ya deaf?"; close; } else { - set .@max,countitem(909)/10; + .@max = countitem(909)/10; mes "Hmm, not bad..."; mes "How many potions"; mes "do you want to get?"; @@ -365,7 +365,7 @@ alberta,190,173,4 script Phelix 4_M_03,{ mes "Hmm, look pansy ass, I said 3 jellopies for 1 Carrot.. got it?"; close; } else { - set .@max,countitem(909)/3; + .@max = countitem(909)/3; mes "Not too bad pansy..."; mes "How many do you want?"; next; |