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/other/stone_change.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/other/stone_change.txt')
| -rw-r--r-- | npc/re/other/stone_change.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/npc/re/other/stone_change.txt b/npc/re/other/stone_change.txt index cfb2aa5eb..f99ae28c5 100644 --- a/npc/re/other/stone_change.txt +++ b/npc/re/other/stone_change.txt @@ -25,14 +25,14 @@ geffen_in,99,174,5 script Ore Tester#sorty 8_F_GIRL,{ mes "[Ore Tester Sorty]"; mes "So, would you like me to organize your ores?"; next; - set .@i, select("Steel, please.:Iron, please.:Iron Ore, please.:Rough Oridecon, please.:No, thanks."); + .@i = select("Steel, please.:Iron, please.:Iron Ore, please.:Rough Oridecon, please.:No, thanks."); if (.@i == 5) { mes "[Ore Tester Sorty]"; mes "Huh, I really hate messy people!"; close; } setarray .@ores[0],999,998,1002,756; - set .@item, .@ores[.@i-1]; + .@item = .@ores[.@i-1]; if (countitem(.@item) == 0) { mes "[Ore Tester Sorty]"; mes "You don't have any "+getitemname(.@item)+"..."; @@ -40,8 +40,8 @@ geffen_in,99,174,5 script Ore Tester#sorty 8_F_GIRL,{ } while(1) { if (countitem(.@item)) { - set .@count, countitem(.@item); - set .@total, .@total + .@count; + .@count = countitem(.@item); + .@total += .@count; delitem .@item, .@count; } else { getitem .@item, .@total; |