diff options
Diffstat (limited to 'npc')
| -rw-r--r-- | npc/001-13-3/_import.txt | 2 | ||||
| -rw-r--r-- | npc/001-13/main.txt | 30 | ||||
| -rw-r--r-- | npc/025-2-3/_mobs.txt | 2 | ||||
| -rw-r--r-- | npc/_import.txt | 1 | ||||
| -rw-r--r-- | npc/commands/event.txt | 9 |
5 files changed, 37 insertions, 7 deletions
diff --git a/npc/001-13-3/_import.txt b/npc/001-13-3/_import.txt new file mode 100644 index 000000000..795d74a65 --- /dev/null +++ b/npc/001-13-3/_import.txt @@ -0,0 +1,2 @@ +// Map 001-13-3: Showdown +// This file is generated automatically. All manually added changes will be removed when running the Converter. diff --git a/npc/001-13/main.txt b/npc/001-13/main.txt index 8e6e4c689..d1557d273 100644 --- a/npc/001-13/main.txt +++ b/npc/001-13/main.txt @@ -79,10 +79,10 @@ function script FYRaid_Select { return; } // Attach map - // TODO: Different scenarios: Block Castle, Sewer, Concrete Dungeon, Crypt, Desert Castle, Mountain, Snowland, Lake Region, Ukar Shrine, Woodland... + // TODO: Different scenarios: Sewer, Concrete Dungeon, Crypt, Desert Castle, Mountain, Snowland, Lake Region, Ukar Shrine, Woodland... .@lv = $FYRAID_LV[.@i]; .@mp$="fyrb@"+getcharid(0); - instance_attachmap(sprintf("001-13-%d", (.@lv % 3)), .@inst, false, .@mp$); + instance_attachmap(sprintf("001-13-%d", (.@lv % 4)), .@inst, false, .@mp$); // Recreate the boss .@mob=monster(.@mp$, 47, 33, $RAIDING_BOSS$, WanderingShadow, 1, "sBossRaid::OnBossDie"); @@ -119,9 +119,29 @@ function script FYRaid_Select { addtimer .@tski, "sBossRaid::OnPump"; dispbottom l("Time left: %s", FuzzyTime(@tm)); closeclientdialog; - // TODO: Spawn an auxiliar every 10 levels - // Amount: level % 10 - // Strength: level / 10 + // Spawn an auxiliar every 5 levels AFTER level 10 + if (.@lv > 10) { + .@qnt = (.@lv % 5) + 1; + .@str = (.@lv / 5); + explode(.@n$, $RAIDING_BOSS$, " "); + .@n$ = l("%s's Minion", .@n$); + for (.@i=0;.@i < .@qnt;.@i++) { + .@m=areamonster(.@mp$, 44, 31, 50, 34, .@n$, MeagerShadow, 1); + setunitdata(.@m, UDT_STR, .@str); + setunitdata(.@m, UDT_AGI, .@str); + setunitdata(.@m, UDT_VIT, .@str); + setunitdata(.@m, UDT_INT, .@str); + setunitdata(.@m, UDT_DEX, .@str); + setunitdata(.@m, UDT_LUK, .@str); + setunitdata(.@m, UDT_ATKMIN, BaseLevel+.@str*3); + setunitdata(.@m, UDT_ATKMAX, BaseLevel+.@str*4); + setunitdata(.@m, UDT_MAXHP, .@str*400); + setunitdata(.@m, UDT_HP, .@str*400); + setunitdata(.@m, UDT_HIT, BaseLevel+.@lv+rand2(.@str*5)); + setunitdata(.@m, UDT_FLEE, 1+rand2(.@str)); + setunitdata(.@m, UDT_CRIT, 1+rand2(.@str)); + } + } return; } diff --git a/npc/025-2-3/_mobs.txt b/npc/025-2-3/_mobs.txt index ceb14c313..cf3cd596b 100644 --- a/npc/025-2-3/_mobs.txt +++ b/npc/025-2-3/_mobs.txt @@ -1,6 +1,6 @@ // This file is generated automatically. All manually added changes will be removed when running the Converter. // Map 025-2-3: Pinkie Cave mobs -025-2-3,55,39,13,14 monster Pinkie 1132,14,4000,8000 +025-2-3,55,39,13,14 monster Pinkie 1132,14,40000,8000 025-2-3,54,41,15,12 monster Pinkie Suseran 1419,10,4000,8000 025-2-3,56,41,17,10 monster Pinkie Maximus 1249,9,20000,2500 025-2-3,48,40,26,6 monster Cave Maggot 1027,9,2000,20000 diff --git a/npc/_import.txt b/npc/_import.txt index 5bcbdccaf..f51ec463e 100644 --- a/npc/_import.txt +++ b/npc/_import.txt @@ -12,6 +12,7 @@ @include "npc/001-13-0/_import.txt" @include "npc/001-13-1/_import.txt" @include "npc/001-13-2/_import.txt" +@include "npc/001-13-3/_import.txt" @include "npc/001-13/_import.txt" @include "npc/001-14/_import.txt" @include "npc/001-2/_import.txt" diff --git a/npc/commands/event.txt b/npc/commands/event.txt index 288875bc4..06b9cd980 100644 --- a/npc/commands/event.txt +++ b/npc/commands/event.txt @@ -292,6 +292,7 @@ function script GlobalEventMenu { ("[FY] Enable Kamelot"), ("[FY] Enable Regnum Blessing"), ("[FY] Enable Candor Season"), + ("[FY] Advance Event Schedule"), ("Reset Kill Saulc Event (Monthly)"); switch (@menu) { @@ -348,7 +349,13 @@ function script GlobalEventMenu { $EVENT$="Candor"; logmes "Enabled CANDOR event.", LOGMES_ATCOMMAND; break; - case 13: DelItemFromEveryPlayer(MurdererCrown); break; + case 13: + logmes "Advanced AURORA event.", LOGMES_ATCOMMAND; + closeclientdialog; detachrid(); + callfunc "FYStopEvent"; callfunc "FYNewEvent"; + end; + break; + case 14: DelItemFromEveryPlayer(MurdererCrown); break; } return; |