summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
Diffstat (limited to 'npc')
-rw-r--r--npc/cities/rachel.txt4
-rw-r--r--npc/custom/healer.txt2
-rw-r--r--npc/events/halloween_2009.txt42
-rw-r--r--npc/events/nguild/nguild_warper.txt6
-rw-r--r--npc/instances/NydhoggsNest.txt2
-rw-r--r--npc/mobs/citycleaners.txt2
-rw-r--r--npc/quests/skills/assassin_skills.txt4
-rw-r--r--npc/re/cities/dewata.txt12
-rw-r--r--npc/re/jobs/3-1/rune_knight.txt4
-rw-r--r--npc/re/quests/quests_brasilis.txt22
10 files changed, 51 insertions, 49 deletions
diff --git a/npc/cities/rachel.txt b/npc/cities/rachel.txt
index db3c6816e..88eb359f1 100644
--- a/npc/cities/rachel.txt
+++ b/npc/cities/rachel.txt
@@ -308,8 +308,8 @@ rachel,206,30,3 script Freya's Priest#play 920,{
set .@play,rand(1,10);
if (.@play == 1) warp "Random",0,0;
else if (.@play == 2) warp "Random",0,0;
- else if (.@play == 3) sc_start SC_SpeedUp1,5000,0;
- else if (.@play == 4) sc_start SC_SpeedUp1,5000,0;
+ else if (.@play == 3) sc_start SC_MOVHASTE_INFINITY,5000,0;
+ else if (.@play == 4) sc_start SC_MOVHASTE_INFINITY,5000,0;
else sc_start SC_SlowDown,5000,0;
end;
}
diff --git a/npc/custom/healer.txt b/npc/custom/healer.txt
index 31f247695..a6f028e8a 100644
--- a/npc/custom/healer.txt
+++ b/npc/custom/healer.txt
@@ -26,7 +26,7 @@
}
specialeffect2 313; percentheal 100,100;
if (.@Buffs) {
- specialeffect2 EF_INCAGILITY; sc_start SC_INCREASEAGI,240000,10;
+ specialeffect2 EF_INCAGILITY; sc_start SC_INC_AGI,240000,10;
specialeffect2 EF_BLESSING; sc_start SC_BLESSING,240000,10;
}
if (.@Delay) set @HD, gettimetick(2)+.@Delay;
diff --git a/npc/events/halloween_2009.txt b/npc/events/halloween_2009.txt
index 9dee31807..a5faf713e 100644
--- a/npc/events/halloween_2009.txt
+++ b/npc/events/halloween_2009.txt
@@ -118,13 +118,13 @@ OnTouch:
mes "[Trick or Treater]";
mes "Yay thank you!";
mes "Here, take this for being so nice!";
- sc_start SC_STRFood, 1800000, 5;
- sc_start SC_INTFood, 1800000, 5;
- sc_start SC_VITFood, 1800000, 5;
- sc_start SC_AGIFood, 1800000, 5;
- sc_start SC_DEXFood, 1800000, 5;
- sc_start SC_LUKFood, 1800000, 5;
- sc_start SC_FLEEFOOD, 1800000, 15;
+ sc_start SC_FOOD_STR, 1800000, 5;
+ sc_start SC_FOOD_INT, 1800000, 5;
+ sc_start SC_FOOD_VIT, 1800000, 5;
+ sc_start SC_FOOD_AGI, 1800000, 5;
+ sc_start SC_FOOD_DEX, 1800000, 5;
+ sc_start SC_FOOD_LUK, 1800000, 5;
+ sc_start SC_FOOD_BASICAVOIDANCE, 1800000, 15;
delitem 529,1; // Candy
close;
}else{
@@ -139,13 +139,13 @@ OnTouch:
mes "[Trick or Treater]";
mes "Yay thank you!";
mes "Here, take this for being so nice!";
- sc_start SC_STRFood, 1800000, 5;
- sc_start SC_INTFood, 1800000, 5;
- sc_start SC_VITFood, 1800000, 5;
- sc_start SC_AGIFood, 1800000, 5;
- sc_start SC_DEXFood, 1800000, 5;
- sc_start SC_LUKFood, 1800000, 5;
- sc_start SC_FLEEFOOD, 1800000, 15;
+ sc_start SC_FOOD_STR, 1800000, 5;
+ sc_start SC_FOOD_INT, 1800000, 5;
+ sc_start SC_FOOD_VIT, 1800000, 5;
+ sc_start SC_FOOD_AGI, 1800000, 5;
+ sc_start SC_FOOD_DEX, 1800000, 5;
+ sc_start SC_FOOD_LUK, 1800000, 5;
+ sc_start SC_FOOD_BASICAVOIDANCE, 1800000, 15;
delitem 530,1; // Candy Cane
close;
}else{
@@ -160,13 +160,13 @@ OnTouch:
mes "[Trick or Treater]";
mes "Yay thank you!";
mes "Here, take this for being so nice!";
- sc_start SC_STRFood, 1800000, 5;
- sc_start SC_INTFood, 1800000, 5;
- sc_start SC_VITFood, 1800000, 5;
- sc_start SC_AGIFood, 1800000, 5;
- sc_start SC_DEXFood, 1800000, 5;
- sc_start SC_LUKFood, 1800000, 5;
- sc_start SC_FLEEFOOD, 1800000, 15;
+ sc_start SC_FOOD_STR, 1800000, 5;
+ sc_start SC_FOOD_INT, 1800000, 5;
+ sc_start SC_FOOD_VIT, 1800000, 5;
+ sc_start SC_FOOD_AGI, 1800000, 5;
+ sc_start SC_FOOD_DEX, 1800000, 5;
+ sc_start SC_FOOD_LUK, 1800000, 5;
+ sc_start SC_FOOD_BASICAVOIDANCE, 1800000, 15;
delitem 538,1; // Well-baked Cookie
close;
}else{
diff --git a/npc/events/nguild/nguild_warper.txt b/npc/events/nguild/nguild_warper.txt
index 57f5bc827..ac54c0716 100644
--- a/npc/events/nguild/nguild_warper.txt
+++ b/npc/events/nguild/nguild_warper.txt
@@ -64,7 +64,7 @@ prontera,146,163,6 script Novice Castles 729,{
sc_end SC_IMPOSITIO;
sc_end SC_SUFFRAGIUM;
sc_end SC_MAGNIFICAT;
- sc_end SC_WEAPONPERFECTION;
+ sc_end SC_WEAPONPERFECT;
sc_end SC_GOSPEL;
sc_end SC_BASILICA;
sc_end SC_MAGICPOWER;
@@ -72,8 +72,8 @@ prontera,146,163,6 script Novice Castles 729,{
sc_end SC_MARIONETTE2;
sc_end SC_DEVOTION;
sc_end SC_SACRIFICE;
- sc_end SC_MAXOVERTHRUST;
- sc_end SC_SPIRIT;
+ sc_end SC_OVERTHRUSTMAX;
+ sc_end SC_SOULLINK;
warp "n_castle",102,93+rand(14);
}
}
diff --git a/npc/instances/NydhoggsNest.txt b/npc/instances/NydhoggsNest.txt
index 2d48d0341..f2fe3fc68 100644
--- a/npc/instances/NydhoggsNest.txt
+++ b/npc/instances/NydhoggsNest.txt
@@ -2182,7 +2182,7 @@ OnDisable:
OnTouch:
percentheal -50,0;
percentheal -30,0;
- sc_start SC_BLEEDING,60000,0;
+ sc_start SC_BLOODING,60000,0;
end;
OnTimer10000:
diff --git a/npc/mobs/citycleaners.txt b/npc/mobs/citycleaners.txt
index 0e810ac5b..876017fd4 100644
--- a/npc/mobs/citycleaners.txt
+++ b/npc/mobs/citycleaners.txt
@@ -46,3 +46,5 @@ einbech,0,0,0,0 monster Tarou 1175,5,1800000,1500000,0
// payon_in02 - Inside Payon
//==================================================
payon_in02,23,68,5,5 monster Thief Bug Egg 1048,7,1200000,600000,0
+
+job3_war01,19,33,5,5 monster Thief Bug Egg 1213,1,12,60,0
diff --git a/npc/quests/skills/assassin_skills.txt b/npc/quests/skills/assassin_skills.txt
index 109d699d3..4fddf6b12 100644
--- a/npc/quests/skills/assassin_skills.txt
+++ b/npc/quests/skills/assassin_skills.txt
@@ -758,7 +758,7 @@ OnTouch:
mes "the coffin bit your";
mes "hand really hard!^000000";
sc_start SC_Poison,30000,0;
- sc_start SC_Bleeding,10000,0;
+ sc_start SC_BLOODING,10000,0;
Emotion e_omg,1;
close;
case 2:
@@ -830,7 +830,7 @@ OnTouch:
mes "the coffin bit your";
mes "hand really hard!^000000";
sc_start SC_Poison,30000,0;
- sc_start SC_Bleeding,10000,0;
+ sc_start SC_BLOODING,10000,0;
Emotion e_omg,1;
close;
}
diff --git a/npc/re/cities/dewata.txt b/npc/re/cities/dewata.txt
index 6bbbfeb4e..3c5953adf 100644
--- a/npc/re/cities/dewata.txt
+++ b/npc/re/cities/dewata.txt
@@ -457,32 +457,32 @@ dewata,89,191,6 script Small Shrine#dew1 844,{
callsub L_Wish;
set Zeny, Zeny - .@input;
if (.@stat & 1 && .@bonus){
- sc_start SC_STRFOOD,1200000,3;
+ sc_start SC_FOOD_STR,1200000,3;
percentheal 5,0;
//consumeitem 12043; //Str_Dish03
}
else if (.@stat & 2 && .@bonus){
- sc_start SC_AGIFOOD,1200000,3;
+ sc_start SC_FOOD_AGI,1200000,3;
percentheal 5,0;
//consumeitem 12058; //Agi_Dish03
}
else if (.@stat & 4 && .@bonus){
- sc_start SC_DEXFOOD,1200000,3;
+ sc_start SC_FOOD_DEX,1200000,3;
percentheal 5,0;
//consumeitem 12063; //Dex_Dish03
}
else if (.@stat & 8 && .@bonus){
- sc_start SC_VITFOOD,1200000,3;
+ sc_start SC_FOOD_VIT,1200000,3;
percentheal 5,0;
//consumeitem 12053; //Vit_Dish03
}
else if (.@stat & 16 && .@bonus){
- sc_start SC_INTFOOD,1200000,3;
+ sc_start SC_FOOD_INT,1200000,3;
percentheal 5,0;
//consumeitem 12048; //Int_Dish03
}
else if (.@stat & 32 && .@bonus){
- sc_start SC_LUKFOOD,1200000,3;
+ sc_start SC_FOOD_LUK,1200000,3;
percentheal 5,0;
//consumeitem 12068; //Luk_Dish03
}
diff --git a/npc/re/jobs/3-1/rune_knight.txt b/npc/re/jobs/3-1/rune_knight.txt
index 6dbfdaa3a..1255c355e 100644
--- a/npc/re/jobs/3-1/rune_knight.txt
+++ b/npc/re/jobs/3-1/rune_knight.txt
@@ -1826,7 +1826,7 @@ job3_rune02,34,46,5 script Captain Tigris#jrt1 470,2,2,{
break;
case 5:
mapannounce "job3_rune02","Captain Tigris : For a Rune Knight, this kind of ordeal is nothing!",bc_map,"0xFFFF00"; //FW_NORMAL 12 0 0
- sc_start SC_BLEEDING,10000,0;
+ sc_start SC_BLOODING,10000,0;
break;
}
set $@job_rune_test2,1;
@@ -2161,4 +2161,4 @@ sec_in02,34,167,3 script R.Knight Job Manager 470,1,1,{
close;
}
job3_rune01,1,1,3 duplicate(R.Knight Job Manager) #renshucheck 844
-*/ \ No newline at end of file
+*/
diff --git a/npc/re/quests/quests_brasilis.txt b/npc/re/quests/quests_brasilis.txt
index 2e1cbe75a..e9256047f 100644
--- a/npc/re/quests/quests_brasilis.txt
+++ b/npc/re/quests/quests_brasilis.txt
@@ -227,9 +227,9 @@ brasilis,192,133,6 script Lucia#brasilis 478,{
if (.@nQState2 > -1) erasequest 9029;
setquest 9029;
percentheal 100,100;
- sc_start SC_LUKFOOD, 1200000, 5; percentheal 5,2;
- sc_start SC_VITFOOD, 1200000, 5; percentheal 10,0;
- sc_start SC_DEXFOOD, 1200000, 5; percentheal 5,5;
+ sc_start SC_FOOD_LUK, 1200000, 5; percentheal 5,2;
+ sc_start SC_FOOD_VIT, 1200000, 5; percentheal 10,0;
+ sc_start SC_FOOD_DEX, 1200000, 5; percentheal 5,5;
getitem 11502,3; //Light_Blue_Pot
close;
}
@@ -971,7 +971,7 @@ OnTouch_:
set brazil_gua,8;
changequest 2197,2198;
close2;
- sc_start SC_SpeedUp1,5000,0;
+ sc_start SC_MOVHASTE_INFINITY,5000,0;
end;
}
else {
@@ -3071,13 +3071,13 @@ bra_dun02,157,74,5 script Iara#nk 478,2,2,{
delitem 11517,1; //Puri_Potion
percentheal 100,100;
sc_start SC_INCFLEE,3600000,20;
- sc_start SC_INCCRI,3600000,10;
- sc_start SC_STRFOOD,1200000,3;
- sc_start SC_DEXFOOD,1200000,3;
- sc_start SC_AGIFOOD,1200000,3;
- sc_start SC_VITFOOD,1200000,3;
- sc_start SC_INTFOOD,1200000,3;
- sc_start SC_LUKFOOD,1200000,3;
+ sc_start SC_CRITICALPERCENT,3600000,10;
+ sc_start SC_FOOD_STR,1200000,3;
+ sc_start SC_FOOD_DEX,1200000,3;
+ sc_start SC_FOOD_AGI,1200000,3;
+ sc_start SC_FOOD_VIT,1200000,3;
+ sc_start SC_FOOD_INT,1200000,3;
+ sc_start SC_FOOD_LUK,1200000,3;
next;
mes "[Iara]";
mes "Ahhh~...";
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-04 12:46:52 +0000