summaryrefslogtreecommitdiff
path: root/npc/custom
diff options
context:
space:
mode:
Diffstat (limited to 'npc/custom')
-rw-r--r--npc/custom/battleground/bg_tierra_01.txt6
-rw-r--r--npc/custom/battleground/bg_tierra_02.txt6
-rw-r--r--npc/custom/bgqueue/flavius.txt12
-rw-r--r--npc/custom/breeder.txt6
-rw-r--r--npc/custom/etc/marriage.txt6
-rw-r--r--npc/custom/etc/monster_arena.txt3
-rw-r--r--npc/custom/etc/rpsroulette.txt3
-rw-r--r--npc/custom/events/cluckers.txt14
-rw-r--r--npc/custom/item_signer.txt2
-rw-r--r--npc/custom/itembind.txt4
-rw-r--r--npc/custom/quests/bandit_beard.txt2
-rw-r--r--npc/custom/quests/elvenear.txt2
-rw-r--r--npc/custom/quests/event_6_new_hats.txt4
-rw-r--r--npc/custom/quests/hunting_missions.txt12
-rw-r--r--npc/custom/quests/may_hats.txt8
-rw-r--r--npc/custom/quests/thq/THQS_Quests.txt10
-rw-r--r--npc/custom/woe_controller.txt2
17 files changed, 52 insertions, 50 deletions
diff --git a/npc/custom/battleground/bg_tierra_01.txt b/npc/custom/battleground/bg_tierra_01.txt
index bab80916b..56a505356 100644
--- a/npc/custom/battleground/bg_tierra_01.txt
+++ b/npc/custom/battleground/bg_tierra_01.txt
@@ -99,13 +99,13 @@ OnReadyCheck:
end;
OnNeutralBreak:
- if( getcharid(4) == $@TierraBG1_id1 )
+ if( getcharid(CHAR_ID_BG) == $@TierraBG1_id1 )
{
mapannounce "bat_a01","Guillaume obtained a neurality banner, so they have an advantage.",1,0x0000FF;
bg_team_setxy $@TierraBG1_id2,42,16;
areawarp "bat_a01",52,208,61,217,"bat_a01",42,16;
}
- else if( getcharid(4) == $@TierraBG1_id2 )
+ else if( getcharid(CHAR_ID_BG) == $@TierraBG1_id2 )
{
mapannounce "bat_a01","Croix obtained a neutrality banner, so they have an advantage.",1,0xFF0000;
bg_team_setxy $@TierraBG1_id1,50,374;
@@ -113,7 +113,7 @@ OnNeutralBreak:
}
else end;
- set .Neutral_Base, getcharid(4);
+ set .Neutral_Base, getcharid(CHAR_ID_BG);
bg_team_setxy .Neutral_Base,56,212;
if( .Guardian_1 == 0 )
diff --git a/npc/custom/battleground/bg_tierra_02.txt b/npc/custom/battleground/bg_tierra_02.txt
index 791f02109..e0f1b402a 100644
--- a/npc/custom/battleground/bg_tierra_02.txt
+++ b/npc/custom/battleground/bg_tierra_02.txt
@@ -99,13 +99,13 @@ OnReadyCheck:
end;
OnNeutralBreak:
- if( getcharid(4) == $@TierraBG2_id1 )
+ if( getcharid(CHAR_ID_BG) == $@TierraBG2_id1 )
{
mapannounce "bat_a02","Guillaume obtained a neurality banner, so they have an advantage.",1,0x0000FF;
bg_team_setxy $@TierraBG2_id2,42,16;
areawarp "bat_a02",52,208,61,217,"bat_a02",42,16;
}
- else if( getcharid(4) == $@TierraBG2_id2 )
+ else if( getcharid(CHAR_ID_BG) == $@TierraBG2_id2 )
{
mapannounce "bat_a02","Croix obtained a neutrality banner, so they have an advantage.",1,0xFF0000;
bg_team_setxy $@TierraBG2_id1,50,374;
@@ -113,7 +113,7 @@ OnNeutralBreak:
}
else end;
- set .Neutral_Base, getcharid(4);
+ set .Neutral_Base, getcharid(CHAR_ID_BG);
bg_team_setxy .Neutral_Base,56,212;
if( .Guardian_1 == 0 )
diff --git a/npc/custom/bgqueue/flavius.txt b/npc/custom/bgqueue/flavius.txt
index 33561db0a..d959253f3 100644
--- a/npc/custom/bgqueue/flavius.txt
+++ b/npc/custom/bgqueue/flavius.txt
@@ -170,12 +170,12 @@ OnReset:
end;
OnCroixQuit:
- queueremove($@Croix_QueueBG1,getcharid(3));
+ queueremove($@Croix_QueueBG1,getcharid(CHAR_ID_ACCOUNT));
callsub L_OnPlayerQuit;
end;
OnGuillaumeQuit:
- queueremove($@Guill_QueueBG1,getcharid(3));
+ queueremove($@Guill_QueueBG1,getcharid(CHAR_ID_ACCOUNT));
callsub L_OnPlayerQuit;
end;
@@ -437,7 +437,7 @@ OnTouch:
}
bat_b01,10,294,3 script Guillaume Vintenar#b01_a 4_M_RASWORD,{
- if ($@FlaviusBG1_id1 == getcharid(4)) {
+ if ($@FlaviusBG1_id1 == getcharid(CHAR_ID_BG)) {
if ($@FlaviusBG1_Victory == 1) {
set .@your_medal,countitem(BF_Badge2);
set .@medal_gap,500 - .@your_medal;
@@ -489,7 +489,7 @@ OnInit:
}
bat_b01,389,14,3 script Croix Vintenar#b01_b 4_M_RASWORD,{
- if ($@FlaviusBG1_id2 == getcharid(4)) {
+ if ($@FlaviusBG1_id2 == getcharid(CHAR_ID_BG)) {
if ($@FlaviusBG1_Victory == 2) {
set .@your_medal,countitem(BF_Badge2);
set .@medal_gap,500 - .@your_medal;
@@ -623,7 +623,7 @@ bat_b01,389,16,3 script Croix Camp#flag31 1_FLAG_EAGLE,{ end; }
bat_b01,10,294,3 script Vintenar#bat_b01_aover 4_M_KY_HEAD,{
set .@A_B_gap,$@Guill_ScoreBG1 - $@Croix_ScoreBG1;
- if ($@FlaviusBG1_id1 == getcharid(4)) {
+ if ($@FlaviusBG1_id1 == getcharid(CHAR_ID_BG)) {
if (.@A_B_gap > 0) {
set .@your_medal,countitem(BF_Badge2);
set .@medal_gap,500 - .@your_medal;
@@ -701,7 +701,7 @@ OnInit:
bat_b01,389,14,3 script Vintenar#bat_b01_bover 4_M_CRU_HEAD,{
set .@A_B_gap,$@Guill_ScoreBG1 - $@Croix_ScoreBG1;
- if ($@FlaviusBG1_id2 == getcharid(4)) {
+ if ($@FlaviusBG1_id2 == getcharid(CHAR_ID_BG)) {
if (.@A_B_gap > 0) {
set .@your_medal,countitem(BF_Badge2);
set .@medal_gap,500 - .@your_medal;
diff --git a/npc/custom/breeder.txt b/npc/custom/breeder.txt
index c02122c3f..555fd4c93 100644
--- a/npc/custom/breeder.txt
+++ b/npc/custom/breeder.txt
@@ -16,16 +16,16 @@ prontera,124,201,1 script Universal Rental NPC 4_F_JOB_BLACKSMITH,{
if (hascashmount()) {
message strcharinfo(PC_NAME),"You must first remove your mount.";
end;
- } else if ((eaclass()&EAJ_THIRDMASK) == EAJ_RANGER && !countitem(Wolf's_Flute)) {
+ } else if ((eaclass()&EAJ_THIRDMASK) == EAJ_RANGER && !countitem(Wolfs_Flute)) {
if (!checkfalcon() && getskilllv(HT_FALCON) && !checkwug()) {
if (select(" ~ Falcon", " ~ Warg") == 1)
setfalcon;
else
- getitem Wolf's_Flute, 1;
+ getitem Wolfs_Flute, 1;
specialeffect2 EF_TEIHIT3;
close;
} else {
- getitem Wolf's_Flute,1;
+ getitem Wolfs_Flute,1;
}
} else if ((eaclass()&EAJ_THIRDMASK) == EAJ_MECHANIC && !checkcart() && getskilllv(MC_PUSHCART)) {
if (!checkmount() != MOUNT_MADO && getskilllv(NC_MADOLICENCE)) {
diff --git a/npc/custom/etc/marriage.txt b/npc/custom/etc/marriage.txt
index 76b0429c8..4e521ec55 100644
--- a/npc/custom/etc/marriage.txt
+++ b/npc/custom/etc/marriage.txt
@@ -723,13 +723,13 @@ function SF_TryRegister {
set $wed_bride$,strcharinfo(PC_NAME);
$wed_bride_sex = Sex;
if ($@wedding_effect == 1) //Store account id for effect.
- set $wedding_effect_id, getcharid(3);
+ set $wedding_effect_id, getcharid(CHAR_ID_ACCOUNT);
} else {
set $wed_groom_progress,1;
set $wed_groom$,strcharinfo(PC_NAME);
$wed_groom_sex = Sex;
if ($@wedding_effect == 2) //Store account id for effect.
- set $wedding_effect_id, getcharid(3);
+ set $wedding_effect_id, getcharid(CHAR_ID_ACCOUNT);
}
}
@@ -882,7 +882,7 @@ function SF_InProgress {
mes "...I am still waiting for your partner to confirm the divorce procedure.";
close;
}
- if (getcharid(0) != $@divorcee) {
+ if (getcharid(CHAR_ID_CHAR) != $@divorcee) {
mes "["+@name$+"]";
mes "I am in the progress of divorcing "+$@divorcer$+".";
mes "Do you know who the spouse is?";
diff --git a/npc/custom/etc/monster_arena.txt b/npc/custom/etc/monster_arena.txt
index 24edd14d9..db4c37b73 100644
--- a/npc/custom/etc/monster_arena.txt
+++ b/npc/custom/etc/monster_arena.txt
@@ -724,7 +724,8 @@ L_Heal:
function script illegalkill {
announce "Illegal Kill by " + strcharinfo(PC_NAME) + " Detected",1;
- percentheal -100,-100;
+ Sp = 0;
+ unitkill getcharid(CHAR_ID_ACCOUNT);
end;
}
diff --git a/npc/custom/etc/rpsroulette.txt b/npc/custom/etc/rpsroulette.txt
index e0f8b8952..331c0f0af 100644
--- a/npc/custom/etc/rpsroulette.txt
+++ b/npc/custom/etc/rpsroulette.txt
@@ -96,7 +96,8 @@ cmd_in02,182,126,2 script Crazy Boris 4_M_03,{
mes "*^0000FFClick^000000* *^FF0000BANG^000000*";
mes "You're dead!";
emotion e_gg;
- percentheal -100,-100;
+ Sp = 0;
+ unitkill getcharid(CHAR_ID_ACCOUNT);
close;
}
specialeffect EF_SUI_EXPLOSION;
diff --git a/npc/custom/events/cluckers.txt b/npc/custom/events/cluckers.txt
index f0967590b..fbdbbed3f 100644
--- a/npc/custom/events/cluckers.txt
+++ b/npc/custom/events/cluckers.txt
@@ -23,20 +23,20 @@ prontera,156,219,4 script Cluckers 4_NFCOCK,{
if (.startcluck) {
specialeffect2 2;
switch(rand(15)) {
- case 0: npctalk "CLUUUUUUCK!!!"; unitskilluseid getcharid(3),"NPC_SELFDESTRUCTION",1; emotion 23; break;
+ case 0: npctalk "CLUUUUUUCK!!!"; unitskilluseid getcharid(CHAR_ID_ACCOUNT),"NPC_SELFDESTRUCTION",1; emotion 23; break;
case 1: npctalk "Cluuuuuck!~"; break;
- case 2: unitskilluseid getcharid(3),"NPC_SELFDESTRUCTION",1; break;
+ case 2: unitskilluseid getcharid(CHAR_ID_ACCOUNT),"NPC_SELFDESTRUCTION",1; break;
case 3: sc_start SC_FREEZE,10000,0; break;
- case 4: npctalk "CLUUUUUUUUUCK!!!"; unitskilluseid getcharid(3),"NPC_SELFDESTRUCTION",1; emotion 23; break;
+ case 4: npctalk "CLUUUUUUUUUCK!!!"; unitskilluseid getcharid(CHAR_ID_ACCOUNT),"NPC_SELFDESTRUCTION",1; emotion 23; break;
case 5: sc_start SC_SLEEP,10000,0; break;
case 6: sc_start SC_STONE,10000,0; emotion 29; break;
- case 7: npctalk "CLUUUUUUCK!!!"; unitskilluseid getcharid(3),"NPC_SELFDESTRUCTION",1; emotion 23; break;
- case 8: npctalk "Cluck! CLUUUCK!!"; unitskilluseid getcharid(3),"NPC_SELFDESTRUCTION",1; emotion 23; break;
+ case 7: npctalk "CLUUUUUUCK!!!"; unitskilluseid getcharid(CHAR_ID_ACCOUNT),"NPC_SELFDESTRUCTION",1; emotion 23; break;
+ case 8: npctalk "Cluck! CLUUUCK!!"; unitskilluseid getcharid(CHAR_ID_ACCOUNT),"NPC_SELFDESTRUCTION",1; emotion 23; break;
case 9: sc_start SC_STUN,10000,0; break;
case 10: sc_start SC_SLEEP,10000,0; emotion 29; break;
case 11: npctalk "Cluck! Cluck!"; break;
case 12: sc_start SC_STUN,10000,0; break;
- case 13: unitskilluseid getcharid(3),"NPC_SELFDESTRUCTION",1; break;
+ case 13: unitskilluseid getcharid(CHAR_ID_ACCOUNT),"NPC_SELFDESTRUCTION",1; break;
default:
if (rand(50) < 4) {
npctalk "WOOF!...........";
@@ -46,7 +46,7 @@ prontera,156,219,4 script Cluckers 4_NFCOCK,{
set .startcluck,0;
} else {
npctalk "Cluck! CLUUUCK!!";
- unitskilluseid getcharid(3),"NPC_SELFDESTRUCTION",1;
+ unitskilluseid getcharid(CHAR_ID_ACCOUNT),"NPC_SELFDESTRUCTION",1;
}
break;
}
diff --git a/npc/custom/item_signer.txt b/npc/custom/item_signer.txt
index 7e90542b1..a0097bb55 100644
--- a/npc/custom/item_signer.txt
+++ b/npc/custom/item_signer.txt
@@ -126,7 +126,7 @@ prt_in,24,61,7 script Perchik 1_M_01,{
delitem2 .@id,1,1,.@ref,0,.@slot[0],.@slot[1],.@slot[2],.@slot[3];
mes "Done!";
emotion e_proud;
- getitem2 .@id,1,1,.@ref,0,254,0,getcharid(0)&0xffff,(getcharid(0)>>16)&0xffff;
+ getitem2 .@id,1,1,.@ref,0,254,0,getcharid(CHAR_ID_CHAR)&0xffff,(getcharid(CHAR_ID_CHAR)>>16)&0xffff;
equip .@id;
close;
}
diff --git a/npc/custom/itembind.txt b/npc/custom/itembind.txt
index 66b37f4e7..8c51ad24d 100644
--- a/npc/custom/itembind.txt
+++ b/npc/custom/itembind.txt
@@ -25,7 +25,7 @@ prontera,144,174,4 script Bound Items 4_M_JP_MID,{
}
mes "What kind of bind?";
.@boundtype = 1 << (select("Account", "Guild", "Character")-1);
- if(.@boundtype == 2 && (!getcharid(2) || getguildmaster(getcharid(2)) != strcharinfo(PC_NAME))) {
+ if(.@boundtype == 2 && (!getcharid(CHAR_ID_GUILD) || getguildmaster(getcharid(CHAR_ID_GUILD)) != strcharinfo(PC_NAME))) {
mes "In order for me to bind an item to a guild you must be the master of one.";
close;
}
@@ -92,7 +92,7 @@ prontera,144,174,4 script Bound Items 4_M_JP_MID,{
next;
for(.@i = 0; .@i < getarraysize(@bound_items); .@i++) {
if(@inventorylist_id[.@item] == @bound_items[.@i] &&
- (!getcharid(2) || getguildmaster(getcharid(2)) != strcharinfo(PC_NAME))
+ (!getcharid(CHAR_ID_GUILD) || getguildmaster(getcharid(CHAR_ID_GUILD)) != strcharinfo(PC_NAME))
) {
mes "I will only unbind guild bound items that the guild master requests.";
close;
diff --git a/npc/custom/quests/bandit_beard.txt b/npc/custom/quests/bandit_beard.txt
index fa1e61eac..9f9e509f4 100644
--- a/npc/custom/quests/bandit_beard.txt
+++ b/npc/custom/quests/bandit_beard.txt
@@ -70,7 +70,7 @@ L_MAKE:
mes "[Bearded Man]";
mes "Let's make you your beard!";
next;
- if(countitem(Flexible_String) < 1 || countitem(Animal's_Skin) < 1 || countitem(Black_Dyestuffs) < 1 || countitem(Granpa_Beard) < 1 ||
+ if(countitem(Flexible_String) < 1 || countitem(Animals_Skin) < 1 || countitem(Black_Dyestuffs) < 1 || countitem(Granpa_Beard) < 1 ||
countitem(Sticky_Mucus) < 100 || countitem(Counteragent) < 1 || countitem(Crystal_Jewel_) < 1) goto L_NOITEMS;
delitem 7200, 1;
delitem 919, 1;
diff --git a/npc/custom/quests/elvenear.txt b/npc/custom/quests/elvenear.txt
index dca4fdfd8..02e650e78 100644
--- a/npc/custom/quests/elvenear.txt
+++ b/npc/custom/quests/elvenear.txt
@@ -36,7 +36,7 @@ geffen,127,49,5 script Elven Ears Quest 4_M_02,{
mes "[Elven Ears quest]";
mes "Good good, let me just check";
next;
- if (countitem(Cat_Hairband)<1 || countitem(Elder_Pixie's_Beard)<20 || countitem(Animal's_Skin)<20) {
+ if (countitem(Cat_Hairband) < 1 || countitem(Elder_Pixies_Beard) < 20 || countitem(Animals_Skin) < 20) {
mes "[Elven Ears Quest]";
mes "You don't have the requirements.";
mes "Please come back another time...";
diff --git a/npc/custom/quests/event_6_new_hats.txt b/npc/custom/quests/event_6_new_hats.txt
index 593293a69..50110ff52 100644
--- a/npc/custom/quests/event_6_new_hats.txt
+++ b/npc/custom/quests/event_6_new_hats.txt
@@ -194,13 +194,13 @@ prt_in,53,56,5 script Jac 1_M_PAY_ELDER,{
mes "Oh, dear. You need 10 Steels...";
close;
}
- if (countitem(Bear's_Foot) < 200) {
+ if (countitem(Bears_Foot) < 200) {
mes "[Jac]";
mes "Oh, dear. You need 200 Bear Footskins...";
close;
}
delitem Steel,10;//Items: Steel,
- delitem Bear's_Foot,200; //Items: Bears Footskin,
+ delitem Bears_Foot,200; //Items: Bears Footskin,
mes "[Jac]";
mes "Wow!! Well done! Finally you have gathered all items needed! We will make the Panda Hat for you right away. Please Wait a Moment.";
next;
diff --git a/npc/custom/quests/hunting_missions.txt b/npc/custom/quests/hunting_missions.txt
index dc4e20f79..611bdd480 100644
--- a/npc/custom/quests/hunting_missions.txt
+++ b/npc/custom/quests/hunting_missions.txt
@@ -50,7 +50,7 @@ function Chk; function Cm;
mes "You've started a mission";
mes "on another character.";
if ( !@hm_char_del_check ) {
- if ( !query_sql( "SELECT 1 FROM `char_reg_num_db` WHERE `key` = 'Mission0' AND `char_id` IN ( SELECT `char_id` FROM `char` WHERE `account_id` = "+ getcharid(3) +" )", .@dummy ) ) {
+ if ( !query_sql( "SELECT 1 FROM `char_reg_num_db` WHERE `key` = 'Mission0' AND `char_id` IN ( SELECT `char_id` FROM `char` WHERE `account_id` = "+ getcharid(CHAR_ID_ACCOUNT) +" )", .@dummy ) ) {
next;
mes "[Hunting Missions]";
mes "I can't seem to find any records";
@@ -198,8 +198,8 @@ Mission_Status:
set #Mission_Count,0;
if (.Delay) set #Mission_Delay, gettimetick(2)+(.Delay*3600);
set Mission_Total, Mission_Total+1;
- if (Mission_Total == 1) query_sql("INSERT INTO `char_reg_num_db` (`char_id`,`key`,`index`,`value`) VALUES ("+getcharid(0)+",'Mission_Total','0',1)");
- else query_sql("UPDATE `char_reg_num_db` SET `value` = "+Mission_Total+" WHERE `char_id` = "+getcharid(0)+" AND `key` = 'Mission_Total'");
+ if (Mission_Total == 1) query_sql("INSERT INTO `char_reg_num_db` (`char_id`,`key`,`index`,`value`) VALUES ("+getcharid(CHAR_ID_CHAR)+",'Mission_Total','0',1)");
+ else query_sql("UPDATE `char_reg_num_db` SET `value` = "+Mission_Total+" WHERE `char_id` = "+getcharid(CHAR_ID_CHAR)+" AND `key` = 'Mission_Total'");
close;
Mission_Info:
@@ -258,7 +258,7 @@ OnBuyItem:
close;
OnNPCKillEvent:
- if (!getcharid(1) || !.Party) {
+ if (!getcharid(CHAR_ID_PARTY) || !.Party) {
if (!#Mission_Count || !Mission0) end;
for (set .@i, 0; .@i<.Quests; set .@i,.@i+1) {
if (strmobinfo(1,killedrid) == strmobinfo(1,getd("Mission"+.@i))) {
@@ -271,8 +271,8 @@ OnNPCKillEvent:
} else if (.Party) {
set .@mob, killedrid;
getmapxy(.@map1$, .@x1, .@y1, UNITTYPE_PC);
- getpartymember getcharid(1),1;
- getpartymember getcharid(1),2;
+ getpartymember getcharid(CHAR_ID_PARTY),1;
+ getpartymember getcharid(CHAR_ID_PARTY),2;
for(set .@i,0; .@i<$@partymembercount; set .@i,.@i+1) {
if (isloggedin($@partymemberaid[.@i], $@partymembercid[.@i])) {
attachrid $@partymemberaid[.@i];
diff --git a/npc/custom/quests/may_hats.txt b/npc/custom/quests/may_hats.txt
index beea787a1..a1864f96f 100644
--- a/npc/custom/quests/may_hats.txt
+++ b/npc/custom/quests/may_hats.txt
@@ -62,10 +62,10 @@ gonryun,187,140,4 script Yakima 4_F_EINWOMAN,{
next;
if (select("Yeah.", "Nay." != 1))
break;
- if(countitem(Tiger_Mask) < 1 || countitem(Tiger_Footskin) < 10 || countitem(Tiger's_Skin) < 30 || countitem(Tiger_Skin_Panties) < 300) goto l_noitem;//Items: Tiger_Mask, Tiger_Skin, Tiger's_Footskin, Tiger_Panty,
+ if(countitem(Tiger_Mask) < 1 || countitem(Tiger_Footskin) < 10 || countitem(Tigers_Skin) < 30 || countitem(Tiger_Skin_Panties) < 300) goto l_noitem;//Items: Tiger_Mask, Tiger_Skin, Tiger_Footskin, Tiger_Panty,
delitem Tiger_Mask,1;//Items: Tiger_Mask,
- delitem Tiger_Footskin,10;//Items: Tiger's_Footskin,
- delitem Tiger's_Skin,30;//Items: Tiger_Skin,
+ delitem Tiger_Footskin,10;//Items: Tiger_Footskin,
+ delitem Tigers_Skin,30;//Items: Tiger_Skin,
delitem Tiger_Skin_Panties,300;//Items: Tiger_Panty,
getitem Lion_Mask,1;//Items: Lion_Mask,
mes "[Yakima]";
@@ -95,7 +95,7 @@ gonryun,187,140,4 script Yakima 4_F_EINWOMAN,{
delitem Manteau_,2;//Items: Manteau_,
delitem Skul_Ring,3;//Items: Skull_Ring,
delitem Old_Manteau,10;//Items: Old_Manteau,
- getitem Skeleton's_Cape,1;//Items: Skeleton_Manteau,
+ getitem Skeletons_Cape,1;//Items: Skeleton_Manteau,
mes "[Yakima]";
mes "Thank you very very much!";
mes callfunc("F_Bye");
diff --git a/npc/custom/quests/thq/THQS_Quests.txt b/npc/custom/quests/thq/THQS_Quests.txt
index bc81fb24b..c0eb1427a 100644
--- a/npc/custom/quests/thq/THQS_Quests.txt
+++ b/npc/custom/quests/thq/THQS_Quests.txt
@@ -228,7 +228,7 @@ N_QuestStart:
///////Job list 3///////
//3-1;
moc_fild04,208,322,6 script Clark 1_M_YOUNGKNIGHT,{
- if (three_qset == 1 && countitem(Elder_Pixie's_Beard) > 29) goto N_QuestComp;
+ if (three_qset == 1 && countitem(Elder_Pixies_Beard) > 29) goto N_QuestComp;
if (three_qset == 1) goto N_QuestStart;
mes "[Clark]";
mes "Love to chat, but I'm waiting for someone.";
@@ -456,7 +456,7 @@ N_QuestStart:
///////Job list 5///////
//5-1;
prt_maze01,18,184,6 script Lithin#01 4_M_CRU_OLD,{
- if (five_qset == 1 && countitem(Wild_Boar's_Mane) > 14) goto N_QuestComp;
+ if (five_qset == 1 && countitem(Wild_Boars_Mane) > 14) goto N_QuestComp;
if (five_qset == 1) goto N_QuestStart;
mes "[Lithin]";
mes "Well hello.";
@@ -975,7 +975,7 @@ N_QuestStart:
}
//10-2;
pay_fild10,145,252,6 script Man#02 2_M_DYEINGER,{
- if (ten_qset == 2 && countitem(Tiger's_Skin) > 0) goto N_QuestComp;
+ if (ten_qset == 2 && countitem(Tigers_Skin) > 0) goto N_QuestComp;
if (ten_qset == 2) goto N_QuestStart;
mes "[Man]";
mes "Sorry I'm waiting for someone, you will have to come back later";
@@ -995,12 +995,12 @@ N_QuestStart:
mes "[Man]";
mes "Tony the Tiger is on Crack! He must be stoped, KILL HIM!";
mes " ";
- mes "Bring me back 1 Tiger's_Skin!";
+ mes "Bring me back 1 Tiger's Skin!";
close;
}
//10-3;
cmd_fild08,328,349,4 script Caral 2_M_SWORDMASTER,{
- if (ten_qset == 3 && countitem(Thin_N'_Long_Tongue) > 0) goto N_QuestComp;
+ if (ten_qset == 3 && countitem(Thin_N_Long_Tongue) > 0) goto N_QuestComp;
if (ten_qset == 3) goto N_QuestStart;
mes "[Caral]";
mes "Sorry I'm waiting for someone, you will have to come back later.";
diff --git a/npc/custom/woe_controller.txt b/npc/custom/woe_controller.txt
index e109951d7..14e288be7 100644
--- a/npc/custom/woe_controller.txt
+++ b/npc/custom/woe_controller.txt
@@ -194,7 +194,7 @@ OnReward:
OnPCLoadMapEvent:
if (!compare(strcharinfo(PC_MAP),"g_cas")) end;
if (((.AutoKick && .Active[0]) || (.NoOwner && !getcastledata(strcharinfo(PC_MAP),1))) && !(.Active[0]&(1<<getd("."+strcharinfo(PC_MAP))))) {
- if (getcharid(2) && getcastledata(strcharinfo(PC_MAP),1) == getcharid(2)) end;
+ if (getcharid(CHAR_ID_GUILD) && getcastledata(strcharinfo(PC_MAP),1) == getcharid(CHAR_ID_GUILD)) end;
sleep2 1000;
message strcharinfo(PC_NAME), getcastlename(strcharinfo(PC_MAP))+" is currently inactive.";
sleep2 5000;
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2025-05-24 19:09:41 +0000