diff options
Diffstat (limited to 'world/map/npc')
| -rw-r--r-- | world/map/npc/008-1/hinnak.txt | 18 | ||||
| -rw-r--r-- | world/map/npc/functions/evil_obelisk.txt | 2 | ||||
| -rw-r--r-- | world/map/npc/functions/mob_points.txt | 2 |
3 files changed, 11 insertions, 11 deletions
diff --git a/world/map/npc/008-1/hinnak.txt b/world/map/npc/008-1/hinnak.txt index d16460c3..ffd1de1f 100644 --- a/world/map/npc/008-1/hinnak.txt +++ b/world/map/npc/008-1/hinnak.txt @@ -17,7 +17,7 @@ L_No_NohMask: if (@state == 1) goto L_Exchange; if (@state == 2) goto L_ThanksAgain; - if (getequipid(equip_head) == 751) goto L_Intro_Hat; + if (getequipid(equip_head) == PinkieHat) goto L_Intro_Hat; mes "[Farmer Hinnak]"; mes "\"Argh! I hate them! I @#$% hate them! I @#$% hate these @#$% pinkies!\""; @@ -66,7 +66,7 @@ L_Reward: goto L_Close; L_Exchange: - if (getequipid(equip_head) != 751) + if (getequipid(equip_head) != PinkieHat) goto L_Exchange_Start; mes "The farmer glares at your hat."; next; @@ -81,13 +81,13 @@ L_Exchange_Start: "Sure, here they are!", L_Exchange_Exchange; L_Exchange_Exchange: - if (countitem("PinkAntenna") < 10) + if (countitem(PinkAntenna) < 10) goto L_Exchange_Notenough; getinventorylist; - if (@inventorylist_count == 100 && countitem("PinkAntenna") > 10) + if (@inventorylist_count == 100 && countitem(PinkAntenna) > 10) goto L_Exchange_TooMany; - delitem "PinkAntenna", 10; - getitem "Scythe", 1; + delitem PinkAntenna, 10; + getitem Scythe, 1; set @state, 2; callsub S_Update_Mask; mes "[Farmer Hinnak]"; @@ -105,7 +105,7 @@ L_Exchange_TooMany: goto L_Close; L_ThanksAgain: - if (getequipid(equip_head) == 751) + if (getequipid(equip_head) == PinkieHat) goto L_ThanksHat; mes "[Farmer Hinnak]"; mes "\"Good to see you again, and thanks again for helping me with the pinkies!\""; @@ -147,9 +147,9 @@ L_Next2: "I don't have any.", L_NoBeer; L_GiveBeer: - if (countitem("Beer") < 1) + if (countitem(Beer) < 1) goto L_NoBeer; - delitem "Beer", 1; + delitem Beer, 1; mes "[Farmer Hinnak]"; mes "Hinnak takes a sip."; mes "\"Aaah! Nothing like a well-deserved beer after a long day of tending the crops!\""; diff --git a/world/map/npc/functions/evil_obelisk.txt b/world/map/npc/functions/evil_obelisk.txt index e2ba0bbe..34c917d5 100644 --- a/world/map/npc/functions/evil_obelisk.txt +++ b/world/map/npc/functions/evil_obelisk.txt @@ -78,7 +78,7 @@ L_GRAVEYARD2_1: if(@temp == 4) set @mob_id, Stalker; if(@temp == 5) - set @mob_id, Scythe; + set @mob_id, FlyingScythe; callsub S_Summon; goto L_GRAVEYARD2_1; diff --git a/world/map/npc/functions/mob_points.txt b/world/map/npc/functions/mob_points.txt index ecea5b82..9ac0e03e 100644 --- a/world/map/npc/functions/mob_points.txt +++ b/world/map/npc/functions/mob_points.txt @@ -74,7 +74,7 @@ function|script|MobPoints 30, // 1066 Vampire Bat 150, // 1067 Reaper2 100, // 1068 Reaper - 20, // 1069 Scythe + 20, // 1069 Flying Scythe 20, // 1070 Ball Lightning 60, // 1071 Ice Element 80, // 1072 Yeti |