Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adjusted some scripts to the new syntax

Browse Source 
Follow up to fd48238
Thanks to @Everade and @Jeybla for reporting this problem in #1468
This commit is contained in:
Lemongrass3110 2016-08-05 00:28:23 +02:00
parent f7a276ec73
commit d017e24cd2
16 changed files with 44 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
npc/custom/breeder.txt
View File

@ -27,7 +27,7 @@ prontera,124,201,1 script Universal Rental NPC 726,{
} else if (!checkcart() && getskilllv("MC_PUSHCART")) setcart;
else if (!checkfalcon() && getskilllv("HT_FALCON") && !checkwug()) setfalcon;
else if (!checkriding() && !checkdragon() && getskilllv("KN_RIDING")) {
if (eaclass()&EAJ_THIRDMASK==EAJ_RUNE_KNIGHT) setdragon;
if ((eaclass()&EAJ_THIRDMASK)==EAJ_RUNE_KNIGHT) setdragon;
else setriding;
} else if (!checkmadogear() && getskilllv("NC_MADOLICENCE")) setmadogear;
else {

2
npc/custom/events/holiday/hallow06.txt
View File

@ -20,7 +20,7 @@ prontera,151,190,5 script Hallows' Eve Event 807,{
emotion e_swt,1;
close;
}
if(EVENT_HALWN06&1 && EVENT_HALWN06&2){
if((EVENT_HALWN06&1) && (EVENT_HALWN06&2)){
mes "I am sorry but you have already completed the event.";
emotion e_sry;
close;

2
npc/custom/jobmaster.txt
View File

@ -89,7 +89,7 @@ function Job_Menu;
close;
}
if (.@eac&EAJL_2)
if (.@eac&(EAJL_UPPER|EAJL_BABY) || roclass(.@eac|EAJL_UPPER) == -1) {
if ((.@eac&(EAJL_UPPER|EAJL_BABY)) || roclass(.@eac|EAJL_UPPER) == -1) {
mes "No more jobs are available.";
close;
}

4
npc/custom/woe_controller.txt
View File

@ -113,7 +113,7 @@ OnMinute00:
if (.Active[0]&(1<<.@j)) Disp_Owner(.Castles$[.@j],1);
if (.ExitWarp) maprespawnguildid .Castles$[.@j],0,3;
}
if (.Options&1 && .Active[0] && .ForceEnd != 2) callsub OnReward, .Active[0];
if ((.Options&1) && .Active[0] && .ForceEnd != 2) callsub OnReward, .Active[0];
deletearray .Active[0],2;
if (.ForceEnd) { set .ForceEnd,0; end; }
break;
@ -169,7 +169,7 @@ OnReward:
if (!.@gid) continue;
set .@size, query_sql("SELECT account_id,char_id FROM `guild_member` WHERE guild_id = '"+.@gid+"' AND "+.@sql$,.@aid,.@cid);
for(set .@j,0; .@j<.@size; set .@j,.@j+1) {
if (.Options&8 && !(.Options&4)) {
if ((.Options&8) && !(.Options&4)) {
set .@ip$, replacestr(getcharip(.@aid[.@j]),".","a");
if (getd(".@ip_"+.@i+"_"+.@ip$)) continue;
setd ".@ip_"+.@i+"_"+.@ip$,1;

10
npc/quests/doomed_swords.txt
View File

@ -25,7 +25,7 @@
prt_in,162,11,2 script Ghatu#magum 86,{
if (event_magum == 0) {
if (dmdswrd_Q2 & 1 || dmdswrd_Q2 & 2 || dmdswrd_Q2 & 4 || dmdswrd_Q2 & 8 || dmdswrd_Q2 & 16 || dmdswrd_Q2 & 32) {
if ((dmdswrd_Q2 & 1) || (dmdswrd_Q2 & 2) || (dmdswrd_Q2 & 4) || (dmdswrd_Q2 & 8) || (dmdswrd_Q2 & 16) || (dmdswrd_Q2 & 32)) {
mes "[Ghatu]";
mes "I've heard of a strange";
mes "blacksmith who lives in";
@ -266,7 +266,7 @@ pay_fild08,218,283,2 script Mysterious Man#magum 89,{
close;
}
if (event_magum == 0) {
if (dmdswrd_Q2 & 1 || dmdswrd_Q2 & 2 || dmdswrd_Q2 & 4 || dmdswrd_Q2 & 8 || dmdswrd_Q2 & 16 || dmdswrd_Q2 & 32) {
if ((dmdswrd_Q2 & 1) || (dmdswrd_Q2 & 2) || (dmdswrd_Q2 & 4) || (dmdswrd_Q2 & 8) || (dmdswrd_Q2 & 16) || (dmdswrd_Q2 & 32)) {
mes "[Mysterious Man]";
mes "Well...?";
mes "What the hell";
@ -619,7 +619,7 @@ pay_fild08,218,283,2 script Mysterious Man#magum 89,{
next;
switch(select("Mysteltainn.:Grimtooth.:Executioner.:Wait! I just remembered!")) {
case 1:
if (dmdswrd_Q2 & 1 || dmdswrd_Q2 & 8) {
if ((dmdswrd_Q2 & 1) || (dmdswrd_Q2 & 8)) {
mes "[Mysterious Blacksmith]";
mes "^0099FF1 Young Twig^000000,";
mes "^0099FF1 Emperium^000000,";
@ -637,7 +637,7 @@ pay_fild08,218,283,2 script Mysterious Man#magum 89,{
mes "sword did you ask me to create?";
close;
case 2:
if (dmdswrd_Q2 & 2 || dmdswrd_Q2 & 16) {
if ((dmdswrd_Q2 & 2) || (dmdswrd_Q2 & 16)) {
mes "[Mysterious Blacksmith]";
mes "I will need...";
mes "^0099FF1 Emperium^000000,";
@ -655,7 +655,7 @@ pay_fild08,218,283,2 script Mysterious Man#magum 89,{
mes "really want to possess it...";
close;
case 3:
if (dmdswrd_Q2 & 4 || dmdswrd_Q2 & 32) {
if ((dmdswrd_Q2 & 4) || (dmdswrd_Q2 & 32)) {
mes "[Mysterious Blacksmith]";
mes "Just bring me...";
mes "^0099FF50 Amulets^000000,";

30
npc/quests/first_class/tu_ma_th01.txt
View File

@ -22,7 +22,7 @@
moc_fild12,166,369,0 script Trace of Battle#1 CLEAR_NPC,{
.@class_thief = ( BaseClass == Job_Thief );
.@class_mage = ( BaseClass == Job_Mage );
if (.@class_thief == 0 && .@class_mage == 0 || eaclass()&EAJL_BABY) {
if (.@class_thief == 0 && .@class_mage == 0 || (eaclass()&EAJL_BABY)) {
mes "^3355FFThere are signs that show";
mes "that some violent scuffle";
mes "might have occurred here,";
@ -84,7 +84,7 @@ moc_fild12,166,369,0 script Trace of Battle#1 CLEAR_NPC,{
moc_fild12,173,215,0 script Trace of Battle#2 CLEAR_NPC,{
.@class_thief = ( BaseClass == Job_Thief );
.@class_mage = ( BaseClass == Job_Mage );
if (.@class_thief == 0 && .@class_mage == 0 || eaclass()&EAJL_BABY) {
if (.@class_thief == 0 && .@class_mage == 0 || (eaclass()&EAJL_BABY)) {
mes "^3355FFThere are signs that show";
mes "that some violent scuffle";
mes "might have occurred here,";
@ -116,7 +116,7 @@ moc_fild12,173,215,0 script Trace of Battle#2 CLEAR_NPC,{
moc_fild12,276,165,0 script Trace of Battle#3 CLEAR_NPC,{
.@class_thief = ( BaseClass == Job_Thief );
.@class_mage = ( BaseClass == Job_Mage );
if (.@class_thief == 0 && .@class_mage == 0 || eaclass()&EAJL_BABY) {
if (.@class_thief == 0 && .@class_mage == 0 || (eaclass()&EAJL_BABY)) {
mes "^3355FFThese look like";
mes "traces of some kind";
mes "of pursuit or battle, but";
@ -149,7 +149,7 @@ moc_fild12,276,165,0 script Trace of Battle#3 CLEAR_NPC,{
moc_fild11,39,163,0 script Trace of Battle#4 CLEAR_NPC,{
.@class_thief = ( BaseClass == Job_Thief );
.@class_mage = ( BaseClass == Job_Mage );
if (.@class_thief == 0 && .@class_mage == 0 || eaclass()&EAJL_BABY) {
if (.@class_thief == 0 && .@class_mage == 0 || (eaclass()&EAJL_BABY)) {
mes "^3355FFThere are signs that show";
mes "that some violent scuffle";
mes "might have occurred here,";
@ -186,7 +186,7 @@ moc_fild11,39,163,0 script Trace of Battle#4 CLEAR_NPC,{
moc_fild11,205,52,0 script Trace of Battle#5 CLEAR_NPC,{
.@class_thief = ( BaseClass == Job_Thief );
.@class_mage = ( BaseClass == Job_Mage );
if (.@class_thief == 0 && .@class_mage == 0 || eaclass()&EAJL_BABY) {
if (.@class_thief == 0 && .@class_mage == 0 || (eaclass()&EAJL_BABY)) {
mes "^3355FFThese look like";
mes "traces of some kind";
mes "of pursuit or battle, but";
@ -267,7 +267,7 @@ moc_fild11,205,52,0 script Trace of Battle#5 CLEAR_NPC,{
moc_fild11,226,235,0 script Trace of Battle#6 CLEAR_NPC,{
.@class_thief = ( BaseClass == Job_Thief );
.@class_mage = ( BaseClass == Job_Mage );
if (.@class_thief == 0 && .@class_mage == 0 || eaclass()&EAJL_BABY) {
if (.@class_thief == 0 && .@class_mage == 0 || (eaclass()&EAJL_BABY)) {
mes "^3355FFThese look like";
mes "traces of some kind";
mes "of pursuit or battle, but";
@ -293,7 +293,7 @@ moc_fild11,226,235,0 script Trace of Battle#6 CLEAR_NPC,{
moc_fild11,184,342,0 script Trace of Battle#7 CLEAR_NPC,{
.@class_thief = ( BaseClass == Job_Thief );
.@class_mage = ( BaseClass == Job_Mage );
if (.@class_thief == 0 && .@class_mage == 0 || eaclass()&EAJL_BABY) {
if (.@class_thief == 0 && .@class_mage == 0 || (eaclass()&EAJL_BABY)) {
mes "^3355FFThese look like";
mes "traces of some kind";
mes "of pursuit or battle, but";
@ -318,7 +318,7 @@ moc_fild11,184,342,0 script Trace of Battle#7 CLEAR_NPC,{
moc_fild17,213,358,0 script Trace of Battle#8 CLEAR_NPC,{
.@class_thief = ( BaseClass == Job_Thief );
.@class_mage = ( BaseClass == Job_Mage );
if (.@class_thief == 0 && .@class_mage == 0 || eaclass()&EAJL_BABY) {
if (.@class_thief == 0 && .@class_mage == 0 || (eaclass()&EAJL_BABY)) {
mes "^3355FFThese look like";
mes "traces of some kind";
mes "of pursuit or battle, but";
@ -355,7 +355,7 @@ moc_fild17,213,358,0 script Trace of Battle#8 CLEAR_NPC,{
moc_fild17,228,274,0 script Trace of Battle#9 CLEAR_NPC,{
.@class_thief = ( BaseClass == Job_Thief );
.@class_mage = ( BaseClass == Job_Mage );
if (.@class_thief == 0 && .@class_mage == 0 || eaclass()&EAJL_BABY) {
if (.@class_thief == 0 && .@class_mage == 0 || (eaclass()&EAJL_BABY)) {
mes "^3355FFThese look like";
mes "traces of some kind";
mes "of pursuit or battle, but";
@ -409,7 +409,7 @@ moc_fild17,228,274,0 script Trace of Battle#9 CLEAR_NPC,{
moc_fild17,34,292,0 script Trace of Battle#10 CLEAR_NPC,{
.@class_thief = ( BaseClass == Job_Thief );
.@class_mage = ( BaseClass == Job_Mage );
if (.@class_thief == 0 && .@class_mage == 0 || eaclass()&EAJL_BABY) {
if (.@class_thief == 0 && .@class_mage == 0 || (eaclass()&EAJL_BABY)) {
mes "^3355FFThese look like";
mes "traces of some kind";
mes "of pursuit or battle, but";
@ -477,7 +477,7 @@ moc_fild18,346,296,0 script Trace of Battle#11 CLEAR_NPC,{
moc_fild18,309,257,0 script Trace of Battle#12 CLEAR_NPC,{
.@class_thief = ( BaseClass == Job_Thief );
.@class_mage = ( BaseClass == Job_Mage );
if (.@class_thief == 0 && .@class_mage == 0 || eaclass()&EAJL_BABY) {
if (.@class_thief == 0 && .@class_mage == 0 || (eaclass()&EAJL_BABY)) {
mes "^3355FFThese look like";
mes "traces of some kind";
mes "of pursuit or battle, but";
@ -510,7 +510,7 @@ moc_fild18,309,257,0 script Trace of Battle#12 CLEAR_NPC,{
moc_fild18,177,333,0 script Trace of Battle#13 CLEAR_NPC,{
.@class_thief = ( BaseClass == Job_Thief );
.@class_mage = ( BaseClass == Job_Mage );
if (.@class_thief == 0 && .@class_mage == 0 || eaclass()&EAJL_BABY) {
if (.@class_thief == 0 && .@class_mage == 0 || (eaclass()&EAJL_BABY)) {
mes "^3355FFThese look like";
mes "traces of some kind";
mes "of pursuit or battle, but";
@ -547,7 +547,7 @@ moc_fild18,177,333,0 script Trace of Battle#13 CLEAR_NPC,{
moc_fild18,111,303,0 script Trace of Battle#14 CLEAR_NPC,{
.@class_thief = ( BaseClass == Job_Thief );
.@class_mage = ( BaseClass == Job_Mage );
if (.@class_thief == 0 && .@class_mage == 0 || eaclass()&EAJL_BABY) {
if (.@class_thief == 0 && .@class_mage == 0 || (eaclass()&EAJL_BABY)) {
mes "^3355FFThese look like";
mes "traces of some kind";
mes "of pursuit or battle, but";
@ -580,7 +580,7 @@ moc_fild18,111,303,0 script Trace of Battle#14 CLEAR_NPC,{
moc_fild18,109,197,0 script Trace of Battle#15 CLEAR_NPC,{
.@class_thief = ( BaseClass == Job_Thief );
.@class_mage = ( BaseClass == Job_Mage );
if (.@class_thief == 0 && .@class_mage == 0 || eaclass()&EAJL_BABY) {
if (.@class_thief == 0 && .@class_mage == 0 || (eaclass()&EAJL_BABY)) {
mes "^3355FFThese look like";
mes "traces of some kind";
mes "of pursuit or battle, but";
@ -752,7 +752,7 @@ moc_fild18,109,197,0 script Trace of Battle#15 CLEAR_NPC,{
moc_fild18,156,96,0 script Trace of Battle#16 CLEAR_NPC,{
.@class_thief = ( BaseClass == Job_Thief );
.@class_mage = ( BaseClass == Job_Mage );
if (.@class_thief == 0 && .@class_mage == 0 || eaclass()&EAJL_BABY) {
if (.@class_thief == 0 && .@class_mage == 0 || (eaclass()&EAJL_BABY)) {
mes "^3355FFThese look like";
mes "traces of some kind";
mes "of pursuit or battle, but";

2
npc/quests/first_class/tu_magician01.txt
View File

@ -37,7 +37,7 @@ geffen,67,180,4 script New Mage Manager#M 8_F,{
mes "a Mage first. Alright, dear?";
close;
}
if(BaseClass != Job_Mage || eaclass()&EAJL_BABY){
if(BaseClass != Job_Mage || (eaclass()&EAJL_BABY)){
mes "You know, sometimes";
mes "other jobs might look a";
mes "little better in some battle";

4
npc/quests/first_class/tu_sword.txt
View File

@ -43,7 +43,7 @@ izlude_in,82,163,3 script Shurank 733,{
mes "come back to me...";
close;
}
if(BaseClass == Job_Swordman && eaclass()&(EAJL_2|EAJL_UPPER|EAJL_THIRD)){
if(BaseClass == Job_Swordman && (eaclass()&(EAJL_2|EAJL_UPPER|EAJL_THIRD))){
mes "From your raiment,";
mes "I see that you are";
if(Sex)
@ -1018,7 +1018,7 @@ geffen,154,143,3 script Dequ'ee 734,{
mes "I don't know how you want to live your life, but you should give the Swordman job some serious thought...";
close;
}
if(BaseClass == Job_Swordman && eaclass()&(EAJL_2|EAJL_UPPER)){
if(BaseClass == Job_Swordman && (eaclass()&(EAJL_2|EAJL_UPPER))){
mes "[Dequ'ee]";
mes "Ah...";
mes "A fellow sword wielder!";

4
npc/quests/juice_maker.txt
View File

@ -19,7 +19,7 @@
//============================================================
prt_in,49,172,3 script Marianne#juice 53,{
if (MISC_QUEST&1 || morison_meat == 15) {
if ((MISC_QUEST&1) || morison_meat == 15) {
mes "[Housewife Marianne]";
mes "Whew...!";
mes "Still, he won't eat anything unless it's Meat. But maybe he will eat fruit if it was cut so that it was easy to eat. Like, if it was blended into juice...";
@ -80,7 +80,7 @@ prt_in,49,172,3 script Marianne#juice 53,{
}
prt_in,47,173,3 script Morrison#juice 97,{
if (MISC_QUEST&1 || morison_meat == 15) {
if ((MISC_QUEST&1) || morison_meat == 15) {
mes "[Little Morrison]";
mes "Bleh... Forget it.";
mes "I'm just going to shrivel to death just eating fruits. Don't bother worrying about me .";

2
npc/quests/quests_lighthalzen.txt
View File

@ -6774,7 +6774,7 @@ lighthalzen,179,170,4 script Ordinary Man 98,{
}
else if(lhz_boss == 7)
{
if(!MISC_QUEST&512)
if(!(MISC_QUEST&512))
{
mes "[Ghalstein]";
mes "An error occurred.";

4
npc/quests/quests_niflheim.txt
View File

@ -253,7 +253,7 @@ nif_in,114,181,0 script #Piano3 111,1,1,{
end;
OnTouch:
if (nif_esc == 12 || nif_esc == 13 || MISC_QUEST & 32) {
if (nif_esc == 12 || nif_esc == 13 || (MISC_QUEST & 32)) {
mes "^3355FFAs you bend towards";
mes "the final empty key space";
mes "to take a better look at it...^000000";
@ -508,7 +508,7 @@ prt_in,161,20,3 script Erious#nif 92,{
}
umbala,215,181,3 script Billik 733,{
if (nif_revive > 1 || MISC_QUEST & 16384) {
if (nif_revive > 1 || (MISC_QUEST & 16384)) {
mes "[Billik]";
mes "Well, long time no see.";
mes "If you have a chance in the";

2
npc/quests/quests_rachel.txt
View File

@ -6312,7 +6312,7 @@ ra_temin,277,159,3 script High Priest Zhed#rachel 932,{
ra_temin,170,46,3 script Panno#rachel 920,{
cutin "ra_fano03",2;
if (ra_tem_q >= 12 || MISC_QUEST & 8192) {
if (ra_tem_q >= 12 || (MISC_QUEST & 8192)) {
cutin "ra_fano03",2;
mes "[Priestess Panno]";
mes "Good day.";

2
npc/quests/quests_umbala.txt
View File

@ -1019,7 +1019,7 @@ um_in,139,48,5 script Phrenetan 783,{
emotion e_go;
close;
}
else if (um_wind == 6 || MISC_QUEST & 32768) {
else if (um_wind == 6 || (MISC_QUEST & 32768)) {
emotion e_an;
mes "[Phrenetan]";
mes "Umbabah! Umbaumbah.....";

2
npc/quests/thana_quest.txt
View File

@ -2292,7 +2292,7 @@ tha_t04,81,36,0 warp to 5th Floor 1,1,tha_t05,62,8
tha_t06,119,120,0 script to 7th Floor 45,1,1,{
end;
OnTouch:
if (eaclass()&(EAJL_2|EAJL_UPPER) || eaclass()&EAJL_THIRD || ((Class == Job_Super_Novice || Class == Job_Taekwon || Class == Job_Star_Gladiator || Class == Job_Soul_Linker || BaseClass == Job_Ninja || Class == Job_Gunslinger) && BaseLevel > 94)) {
if ((eaclass()&(EAJL_2|EAJL_UPPER)) || (eaclass()&EAJL_THIRD) || ((Class == Job_Super_Novice || Class == Job_Taekwon || Class == Job_Star_Gladiator || Class == Job_Soul_Linker || BaseClass == Job_Ninja || Class == Job_Gunslinger) && BaseLevel > 94)) {
if (countitem(7425) > 0) {
mes "The shadow of a Black Key is gleaming in the center of the portal.";
mes "To pass this way, looks like I need something.";

12
npc/re/cities/dewata.txt
View File

@ -519,17 +519,17 @@ dewata,89,191,6 script Small Shrine#dew1 844,{
next;
callsub L_Wish;
set Zeny, Zeny - .@input;
if (.@stat & 1 && .@bonus)
if ((.@stat & 1) && .@bonus)
consumeitem 12043; //Str_Dish03
else if (.@stat & 2 && .@bonus)
else if ((.@stat & 2) && .@bonus)
consumeitem 12058; //Agi_Dish03
else if (.@stat & 4 && .@bonus)
else if ((.@stat & 4) && .@bonus)
consumeitem 12063; //Dex_Dish03
else if (.@stat & 8 && .@bonus)
else if ((.@stat & 8) && .@bonus)
consumeitem 12053; //Vit_Dish03
else if (.@stat & 16 && .@bonus)
else if ((.@stat & 16) && .@bonus)
consumeitem 12048; //Int_Dish03
else if (.@stat & 32 && .@bonus)
else if ((.@stat & 32) && .@bonus)
consumeitem 12068; //Luk_Dish03
else if (.@stat & 64) {
specialeffect2 EF_ANGEL;

4
npc/re/other/adven_boards.txt
View File

@ -2332,7 +2332,7 @@ lhz_cube,234,97,0 script Signpost#Somatology 2_BULLETIN_BOARD,{
}
ra_temin,31,316,0 script Signpost#Holy Ground 2_BULLETIN_BOARD,{
if (MISC_QUEST & 8192 == 0) {
if ((MISC_QUEST & 8192) == 0) {
mes "Holy Ground";
mes "- High Priest Zhed -";
close;
@ -2713,7 +2713,7 @@ prt_fild05,278,220,0 script Signpost#Culvert 2_BULLETIN_BOARD,{
mes "Prontera Culvert can only be accessed by adventurers who have the permission from Rune Midgard Kingdrom.";
mes "-- Adventurer Group --";
next;
if (MISC_QUEST & 8 == 0) {
if ((MISC_QUEST & 8) == 0) {
mes "[Prontera Culvert]";
mes "Prontera Culvert can only be accessed by adventurers who have signed a volunteer form at Prontera Chivalry. Would you like to go sign the volunteer form?";
next;