diff options
| -rw-r--r-- | npc/001-1/eventmaster.txt | 8 | ||||
| -rw-r--r-- | npc/functions/event.txt | 6 |
2 files changed, 9 insertions, 5 deletions
diff --git a/npc/001-1/eventmaster.txt b/npc/001-1/eventmaster.txt index 68bcb4e5f..f40018da0 100644 --- a/npc/001-1/eventmaster.txt +++ b/npc/001-1/eventmaster.txt @@ -113,7 +113,7 @@ L_Spawn: L_Preset: select "Abort", // 1 - "20x Piou, Piousee, Ratto, 10x Croc", // 2 + "20x Piou, Piousse, Ratto, 10x Croc", // 2 "20x Little Blub, 10x Plushroom Field", // 3 "(agr) 5x Tipiu, 10x Cave Maggot, 10x Bat", // 4 "20x Scorpion, 10x Duck, 10x Maggot", // 5 @@ -147,7 +147,7 @@ L_Preset: case 1: goto L_Spawn; break; - //"20x Piou, Piousee, Ratto, 10x Croc", // 2 + //"20x Piou, Piousse, Ratto, 10x Croc", // 2 //"20x Little Blub, 10x Plushroom Field", // 3 //"(agr) 5x Tipiu, 10x Cave Maggot, 10x Bat", // 4 //"20x Scorpion, 10x Duck, 10x Maggot", // 5 @@ -156,7 +156,7 @@ L_Preset: //"(agr) 5x Slime Blast, 5x Red Slime, 10x White Slime", // 8 case 2: spawner(strmobinfo(1, Piou), Piou, 20); - spawner(strmobinfo(1, Piousee), Piousee, 20); + spawner(strmobinfo(1, Piousse), Piousse, 20); spawner(strmobinfo(1, Ratto), Ratto, 20); spawner(strmobinfo(1, Croc), Croc, 10); @log_spawns=@log_spawns+70; @@ -726,7 +726,7 @@ OnAutoSched: freeloop(true); for (.@i = 0; .@i < ($@AEROS_AUTOSPAWN * 5); .@i++) { .@r=rand2(5, 12); - .@m=any(Piou, Piousee, Ratto, LittleBlub, Croc, PlushroomField, + .@m=any(Piou, Piousse, Ratto, LittleBlub, Croc, PlushroomField, Tipiu, CaveMaggot, Bat, Scorpion, Duck, Maggot, RedScorpion, ManaBug, ManaGhost, HouseMaggot, RedSlime, WhiteSlime, SlimeBlast, Mouboo, Bandit, BlackScorpion, GiantMaggot, diff --git a/npc/functions/event.txt b/npc/functions/event.txt index 961ba876b..d8c7a92b6 100644 --- a/npc/functions/event.txt +++ b/npc/functions/event.txt @@ -393,7 +393,7 @@ OnTimer90000: .score+=.users; // Do event (lasts 45 minutes) - if (!.event && !$@MK_SCENE && .score > 300 && .users >= 3) { + if (!.event && !$@MK_SCENE && .score > 300 && (.users >= 3 || $@GM_OVERRIDE)) { /* Reserve Aeros */ $@MK_SCENE=MK_LOCKED; /* Setup the event */ @@ -410,6 +410,10 @@ OnTimer90000: initnpctimer; end; + +OnForceInit: + .score+=9999; + goto OnTimer90000; } function script sThanksgiving { |