diff options
| -rw-r--r-- | npc/005-1/ayasha.txt | 36 |
1 files changed, 21 insertions, 15 deletions
diff --git a/npc/005-1/ayasha.txt b/npc/005-1/ayasha.txt index 06e1593a5..778acd60e 100644 --- a/npc/005-1/ayasha.txt +++ b/npc/005-1/ayasha.txt @@ -15,7 +15,7 @@ 005-1,52,81,0 script Ayasha NPC_HUMAN_FEMALE_NOOB,{ showavatar NPC_HUMAN_FEMALE_NOOB; // this is handled by avatars.xml - if (strcharinfo(2) == "Monster King") goto L_MKControl; + if (strcharinfo(2) == "Monster King" && is_admin()) goto L_MKControl; function quest_findAllKids { @@ -146,34 +146,40 @@ L_MKSmall: disablenpc("Mana Stone"); pvpon("005-1"); announce(l("##1WARNING! WARNING! Siege starting at Candor!!"), bc_all); - areamonster("005-1", 0, 0, 105, 105, l("Black Scorpion"), 1074, 1, "Ayasha::OnBlackScorpionDeath"); - areamonster("005-1", 0, 0, 105, 105, ("House Maggot"), 1084, 3, "Ayasha::OnHouseMaggotDeath"); + areamonster("005-1", 0, 0, 105, 105, l("Black Scorpion"), BlackScorpion, 1, "Ayasha::OnBlackScorpionDeath"); + areamonster("005-1", 0, 0, 105, 105, ("House Maggot"), HouseMaggot, 3, "Ayasha::OnHouseMaggotDeath"); initnpctimer; close; OnBlackScorpionDeath: - areamonster("005-1", 0, 0, 105, 105, l("Black Scorpion"), 1074, 1, "Ayasha::OnBlackScorpionDeath"); + dispbottom "BSD"; + areamonster("005-1", 0, 0, 105, 105, l("Black Scorpion"), BlackScorpion, 1, "Ayasha::OnBlackScorpionDeath"); if (rand(10000) <= 900) getitem StrangeCoin, 1; + debugmes "BSD OK"; end; OnManaGhostDeath: - areamonster("005-1", 0, 0, 105, 105, l("Mana Ghost"), 1068, 1, "Ayasha::OnManaGhostDeath"); + dispbottom "MGD"; + areamonster("005-1", 0, 0, 105, 105, l("Mana Ghost"), ManaGhost, 1, "Ayasha::OnManaGhostDeath"); if (rand(10000) <= 500) getitem StrangeCoin, 1; + debugmes "MGD OK"; end; OnHouseMaggotDeath: - areamonster("005-1", 0, 0, 105, 105, l("House Maggot"), 1068, 1, "Ayasha::OnManaGhostDeath"); + dispbottom "HMD"; + areamonster("005-1", 0, 0, 105, 105, l("House Maggot"), ManaGhost, 1, "Ayasha::OnHouseMaggotDeath"); if (rand(10000) <= 400) getitem StrangeCoin, 1; + debugmes "HMD OK"; end; OnTimer5000: - areamonster("005-1", 0, 0, 105, 105, "Black Scorpion", 1074, 1, "Ayasha::OnBlackScorpionDeath"); - areamonster("005-1", 0, 0, 105, 105, ("House Maggot"), 1084, 10, "Ayasha::OnHouseMaggotDeath"); + areamonster("005-1", 0, 0, 105, 105, "Black Scorpion", BlackScorpion, 1, "Ayasha::OnBlackScorpionDeath"); + areamonster("005-1", 0, 0, 105, 105, ("House Maggot"), HouseMaggot, 10, "Ayasha::OnHouseMaggotDeath"); mapannounce("003-1", "##2Message to all Candor NPCs: Take shelter!", bc_map); disablenpc "Ayasha"; disablenpc "Charda"; @@ -198,9 +204,9 @@ OnTimer5000: end; OnTimer60000: - areamonster("005-1", 0, 0, 105, 105, "Black Scorpion", 1074, 1, "Ayasha::OnBlackScorpionDeath"); - areamonster("005-1", 0, 0, 105, 105, ("Mana Ghost"), 1068, 3, "Ayasha::OnManaGhostDeath"); - areamonster("005-1", 0, 0, 105, 105, ("House Maggot"), 1084, 5, "Ayasha::OnHouseMaggotDeath"); + areamonster("005-1", 0, 0, 105, 105, "Black Scorpion", BlackScorpion, 1, "Ayasha::OnBlackScorpionDeath"); + areamonster("005-1", 0, 0, 105, 105, ("Mana Ghost"), ManaGhost, 3, "Ayasha::OnManaGhostDeath"); + areamonster("005-1", 0, 0, 105, 105, ("House Maggot"), HouseMaggot, 5, "Ayasha::OnHouseMaggotDeath"); end; OnTimer120000: @@ -211,15 +217,15 @@ OnTimer360000: OnTimer420000: OnTimer480000: areamonster("005-1", 0, 0, 105, 105, ("Slime Blast"), 1090, 1); - areamonster("005-1", 0, 0, 105, 105, ("Mana Ghost"), 1068, 1, "Ayasha::OnManaGhostDeath"); - areamonster("005-1", 0, 0, 105, 105, ("House Maggot"), 1084, 1, "Ayasha::OnHouseMaggotDeath"); + areamonster("005-1", 0, 0, 105, 105, ("Mana Ghost"), ManaGhost, 1, "Ayasha::OnManaGhostDeath"); + areamonster("005-1", 0, 0, 105, 105, ("House Maggot"), HouseMaggot, 1, "Ayasha::OnHouseMaggotDeath"); end; OnTimer540000: mapannounce("005-1", "##1The Monster Army is getting tired of resistance!", bc_map); areamonster("005-1", 0, 0, 105, 105, ("Slime Blast"), 1090, 5); - areamonster("005-1", 0, 0, 105, 105, ("Mana Ghost"), 1068, 1, "Ayasha::OnManaGhostDeath"); - areamonster("005-1", 0, 0, 105, 105, ("House Maggot"), 1084, 1, "Ayasha::OnHouseMaggotDeath"); + areamonster("005-1", 0, 0, 105, 105, ("Mana Ghost"), ManaGhost, 1, "Ayasha::OnManaGhostDeath"); + areamonster("005-1", 0, 0, 105, 105, ("House Maggot"), HouseMaggot, 1, "Ayasha::OnHouseMaggotDeath"); end; OnTimer600000: |