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/quests/cupet.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/quests/cupet.txt')
| -rw-r--r-- | npc/re/quests/cupet.txt | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/npc/re/quests/cupet.txt b/npc/re/quests/cupet.txt index 829ec2dae..3e339e168 100644 --- a/npc/re/quests/cupet.txt +++ b/npc/re/quests/cupet.txt @@ -14,14 +14,14 @@ // 1st NPC - script CPM1 4_M_ALCHE_C,{ - set .@npc$, "[Cute Pet Manager]"; + .@npc$ = "[Cute Pet Manager]"; setarray .@tame_id[0],619,620,622,623,624,627,628,629,630; setarray .@tame_amount[0],3,3,3,3,3,3,3,3,3; setarray .@hunt_id[0],909,909,705,916,935,919,919,940,921; setarray .@hunt_amount[0],500,600,500,500,500,500,600,500,500; setarray .@mob_id[0],1002,1113,1063,1049,1011,1167,1107,1052,1014; - set .@tame_gets, 3; + .@tame_gets = 3; if (cpm_one == .@tame_gets) { mes "[Cute Pet Manager]"; @@ -45,7 +45,7 @@ // 2nd NPC - script CPM2 4_M_ALCHE_C,{ - set .@npc$, "[Cute Pet Manager]"; + .@npc$ = "[Cute Pet Manager]"; setarray .@tame_id[0],621,625,632,631,633,634,635,636,659,637,639,640; setarray .@tame_amount[0],2,2,2,2,2,2,2,2,2,2,2,2; @@ -53,7 +53,7 @@ setarray .@hunt_amount[0],500,600,500,300,500,500,500,500,500,500,500,500; setarray .@hunt_item_count[0],1,1,1,1,1,1,1,1,1; setarray .@mob_id[0],1031,1042,1019,1077,1056,1057,1023,1026,1188,1110,1029; - set .@tame_gets, 2; + .@tame_gets = 2; if (cpm_two == .@tame_gets) { mes "[Cute Pet Manager]"; @@ -77,7 +77,7 @@ // 3rd NPC - script CPM3 4_M_ALCHE_C,{ - set .@npc$, "[Cute Pet Manager]"; + .@npc$ = "[Cute Pet Manager]"; setarray .@tame_id[0],638,626,641,661,660,642; setarray .@tame_amount[0],1,1,1,1,1,1; @@ -86,7 +86,7 @@ setarray .@hunt_id2[0],0,0,0,0,7017,0; setarray .@hunt_amount2[0],0,0,0,0,20,0; setarray .@mob_id[0],1170,1035,1109,1275,1200,1101; - set .@tame_gets, 1; + .@tame_gets = 1; if (cpm_three == .@tame_gets) { mes "[Cute Pet Manager]"; @@ -158,21 +158,21 @@ function script cute_pet_manager { next; // Create Menu System - for (set .@a, 0; .@a < getarraysize(getarg(0)); set .@a, .@a + 1) { - set .@menu$, .@menu$ + (.@menu$ == "" ? "" : ":") + getitemname(getelementofarray(getarg(0), .@a)); + for (.@a = 0; .@a < getarraysize(getarg(0)); ++.@a) { + .@menu$ += (.@menu$ == "" ? "" : ":") + getitemname(getelementofarray(getarg(0), .@a)); } // Query Player Choice - set .@choice, select(.@menu$) - 1; + .@choice = select(.@menu$) - 1; // Store Variables (Less Lookup) - set .@tame_id, getelementofarray(getarg(0), .@choice); - set .@tame_amount, getelementofarray(getarg(1), .@choice); - set .@hunt_id, getelementofarray(getarg(2), .@choice); - set .@hunt_amount, getelementofarray(getarg(3), .@choice); - set .@mob_id, getelementofarray(getarg(4), .@choice); - set .@hunt_id2, getelementofarray(getarg(7), .@choice); - set .@hunt_amount2, getelementofarray(getarg(8), .@choice); + .@tame_id = getelementofarray(getarg(0), .@choice); + .@tame_amount = getelementofarray(getarg(1), .@choice); + .@hunt_id = getelementofarray(getarg(2), .@choice); + .@hunt_amount = getelementofarray(getarg(3), .@choice); + .@mob_id = getelementofarray(getarg(4), .@choice); + .@hunt_id2 = getelementofarray(getarg(7), .@choice); + .@hunt_amount2 = getelementofarray(getarg(8), .@choice); dispbottom "Tame ID: " + .@tame_id; dispbottom "Tame Amount: " + .@tame_amount; @@ -183,7 +183,7 @@ function script cute_pet_manager { dispbottom "Hunt ID2: " + .@hunt_id2; dispbottom "Hunt Amount2: " + .@hunt_amount2; - if (.@hunt_id2) { set .@hunt2_count, countitem(.@hunt_id2); } + if (.@hunt_id2) { .@hunt2_count = countitem(.@hunt_id2); } if (countitem(.@hunt_id) >= .@hunt_amount && countitem(6083) > 0 && .@hunt2_count >= .@hunt_amount2) { mes "[Cute Pet Manager]"; |