summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
Diffstat (limited to 'npc')
-rw-r--r--npc/custom/etc/monster_arena.txt6
-rw-r--r--npc/custom/etc/shifty_assassin.txt2
-rw-r--r--npc/custom/quests/quest_shop.txt18
3 files changed, 11 insertions, 15 deletions
diff --git a/npc/custom/etc/monster_arena.txt b/npc/custom/etc/monster_arena.txt
index 251759a7c..0b6b1cc96 100644
--- a/npc/custom/etc/monster_arena.txt
+++ b/npc/custom/etc/monster_arena.txt
@@ -766,11 +766,7 @@ gon_test,72,87,5 duplicate(SummonPad) Summon Pad 3 111,2,2
// Skill Disabler //
-gon_test,57,99,5 script Skill Disable 111,3,3,{
- atcommand strcharinfo(0) + "@skilloff";
- disablenpc "Skill Disable";
- end;
-}
+gon_test mapflag noskill
// Duel Arena //
gon_test,58,103,5 script Duel Master#01 92,{
diff --git a/npc/custom/etc/shifty_assassin.txt b/npc/custom/etc/shifty_assassin.txt
index 8f4bbe4cf..46d3aab07 100644
--- a/npc/custom/etc/shifty_assassin.txt
+++ b/npc/custom/etc/shifty_assassin.txt
@@ -100,7 +100,7 @@ M_Kill:
mes "Your attack succeeded but only ^FF0000" + #ninjasr + "^000000 Ninjas survived.";
atcommand strcharinfo(0) + "@kill "+@name$;
- announce @name$+" has been assassinated by " + strcharinfo(0) +"'s Ninjas.",8;
+ announce @name$+" has been assassinated by " + strcharinfo(0) +"'s Ninjas.",bc_npc;
close;
// FAILED ATTACK //
diff --git a/npc/custom/quests/quest_shop.txt b/npc/custom/quests/quest_shop.txt
index 3565d5574..bfb5a20b7 100644
--- a/npc/custom/quests/quest_shop.txt
+++ b/npc/custom/quests/quest_shop.txt
@@ -102,13 +102,13 @@ OnBuyItem:
specialeffect2 699;
close;
case 2:
- set @qe3, getlook(3);
- set @qe4, getlook(4);
- set @qe5, getlook(5);
+ set @qe3, getlook(LOOK_HEAD_BOTTOM);
+ set @qe4, getlook(LOOK_HEAD_TOP);
+ set @qe5, getlook(LOOK_HEAD_MID);
set @qe6,1;
- if (@qe1&1) atcommand "@changelook 3 "+@qe2;
- if (@qe1&256) atcommand "@changelook 1 "+@qe2;
- if (@qe1&512) atcommand "@changelook 2 "+@qe2;
+ if (@qe1&1) changelook LOOK_HEAD_BOTTOM, @qe2;
+ if (@qe1&256) changelook LOOK_HEAD_TOP, @qe2;
+ if (@qe1&512) changelook LOOK_HEAD_MID, @qe2;
break;
case 3:
close;
@@ -116,9 +116,9 @@ OnBuyItem:
}
OnEnd:
if (@qe6) {
- atcommand "@changelook 3 "+@qe3;
- atcommand "@changelook 1 "+@qe4;
- atcommand "@changelook 2 "+@qe5;
+ changelook LOOK_HEAD_BOTTOM, @qe3;
+ changelook LOOK_HEAD_TOP, @qe4;
+ changelook LOOK_HEAD_MID, @qe5;
}
for(set .@i,0; .@i<7; set .@i,.@i+1)
setd "@qe"+.@i,0;