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/other/gympass.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/other/gympass.txt')
| -rw-r--r-- | npc/other/gympass.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/npc/other/gympass.txt b/npc/other/gympass.txt index 3f15debc1..8f5bd738d 100644 --- a/npc/other/gympass.txt +++ b/npc/other/gympass.txt @@ -50,8 +50,8 @@ payon,173,141,4 script Ripped Cabus#GymPass 4_M_HUMAN_02,{ switch(select("Yes:No:Um, my workouts wore off.")) { case 1: if (gympassmemory < 10) { - set .@add_carry,gympassmemory + 1; - set .@remain_carry,10 - .@add_carry; + .@add_carry = gympassmemory + 1; + .@remain_carry = 10 - .@add_carry; if (countitem(7776) > 0) { mes "[Ripped]"; mes "Oh, awesome, I see you"; @@ -76,8 +76,8 @@ payon,173,141,4 script Ripped Cabus#GymPass 4_M_HUMAN_02,{ mes "^FF00000" + .@remain_carry + "^000000 more times if we continue"; mes "training together like this."; delitem 7776,1; //Max_Weight_Up_Scroll - set gympassmemory,.@add_carry; - skill "ALL_INCCARRY",.@add_carry,3; + gympassmemory = .@add_carry; + skill ALL_INCCARRY,.@add_carry,3; close; } else { |