From 5a6cc045a38a775943b29ca5903520c96935f2d1 Mon Sep 17 00:00:00 2001 From: KarLaeda Date: Sat, 2 Dec 2006 02:20:32 +0000 Subject: Fixed event's label for many quest-spawned monsters git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9386 54d463be-8e91-2dee-dedb-b68131a5f0ec --- npc/Changelog.txt | 1 + npc/cities/niflheim.txt | 22 +++--- npc/custom/quests/thq/THQS_Quests.txt | 12 +-- npc/custom/tougijou.txt | 131 +++++++++++++++++---------------- npc/jobs/2-2/monk.txt | 60 ++++++++------- npc/other/arena.txt | 88 +++++++++++----------- npc/quests/The_Sign_Quest.txt | 16 ++-- npc/quests/newgears/2004_headgears.txt | 2 +- 8 files changed, 175 insertions(+), 157 deletions(-) diff --git a/npc/Changelog.txt b/npc/Changelog.txt index 5bc02f4ff..96cac5c71 100644 --- a/npc/Changelog.txt +++ b/npc/Changelog.txt @@ -34,6 +34,7 @@ KarLaeda Date Added ====== 12/01 + * Fixed event's label for many quest-spawned monsters [KarLaeda] * Small fix to The Sign Quest [KarLaeda] * Removed outdated Thief Bug ID [Playtester] - 1017 and 1021 don't exist anymore diff --git a/npc/cities/niflheim.txt b/npc/cities/niflheim.txt index 6c20f0141..7dc7a0aa1 100644 --- a/npc/cities/niflheim.txt +++ b/npc/cities/niflheim.txt @@ -136,8 +136,8 @@ L_end: close; } -niflheim.gat,350,258,5 script Cursed Soul 802,{ - killmonster "niflheim.gat","OnNFMob"; +niflheim.gat,350,258,5 script Cursed Soul::cursedsoul 802,{ + killmonster "niflheim.gat","cursedsoul::OnNFMob"; mes "[Ashe Bruce]"; mes "I feel a strong curse on youaaaahhhhh"; mes "I shall deny your existanceahhhhhhh"; @@ -151,7 +151,7 @@ L_book1: mes "Don't you touch my bookssssahhh!!"; mes "Ahahaha, I curse you for being bitten, torn and clawed at!!"; mes "Forever binded to this curse!!"; - monster "niflheim.gat",350,258,"Rideword",1478,1,"OnNFMob"; + monster "niflheim.gat",350,258,"Rideword",1478,1,"cursedsoul::OnNFMob"; close; L_book2: @@ -192,13 +192,13 @@ L_book3: mes "Hahahaha!! Your prayers were wrong!!"; mes "Time to face deathohohohoho,"; mes "May you be cursed forevahahahaha!!"; - monster "niflheim.gat",349,256,"Orc Skeleton",1462,1,"OnNFMob"; - monster "niflheim.gat",347,258,"Orc Skeleton",1462,1,"OnNFMob"; - monster "niflheim.gat",347,254,"Orc Skeleton",1462,1,"OnNFMob"; - monster "niflheim.gat",350,252,"Orc Skeleton",1462,1,"OnNFMob"; - monster "niflheim.gat",344,255,"Orc Skeleton",1462,1,"OnNFMob"; - monster "niflheim.gat",348,252,"Orc Skeleton",1462,1,"OnNFMob"; - monster "niflheim.gat",347,259,"Orc Skeleton",1462,1,"OnNFMob"; + monster "niflheim.gat",349,256,"Orc Skeleton",1462,1,"cursedsoul::OnNFMob"; + monster "niflheim.gat",347,258,"Orc Skeleton",1462,1,"cursedsoul::OnNFMob"; + monster "niflheim.gat",347,254,"Orc Skeleton",1462,1,"cursedsoul::OnNFMob"; + monster "niflheim.gat",350,252,"Orc Skeleton",1462,1,"cursedsoul::OnNFMob"; + monster "niflheim.gat",344,255,"Orc Skeleton",1462,1,"cursedsoul::OnNFMob"; + monster "niflheim.gat",348,252,"Orc Skeleton",1462,1,"cursedsoul::OnNFMob"; + monster "niflheim.gat",347,259,"Orc Skeleton",1462,1,"cursedsoul::OnNFMob"; close; L_back: @@ -206,4 +206,6 @@ L_back: mes "Ahahahaha! Not bad thinking at alllhhhaahaaa..."; mes "I shall pray that you live to returnahhhh...."; close; +OnNFMob: + end; } diff --git a/npc/custom/quests/thq/THQS_Quests.txt b/npc/custom/quests/thq/THQS_Quests.txt index cc5eeb037..623e281fc 100644 --- a/npc/custom/quests/thq/THQS_Quests.txt +++ b/npc/custom/quests/thq/THQS_Quests.txt @@ -354,7 +354,7 @@ N_QuestComp: delitem 957,50; set four_qset,0; set On_Quest,0; - killmonster "pay_dun00.gat","kaho"; + killmonster "pay_dun00.gat","Flora::OnMobDead"; close; N_QuestStart: mes "[Flora]"; @@ -367,9 +367,11 @@ N_QuestStart: mes "[Flora]"; mes "Good Luck"; mes "Remember I need 50 Nail's"; - monster "pay_dun00.gat",0,0,"Flaming Bastard",1072,1,"kaho"; - monster "pay_dun00.gat",0,0,"Flaming Bastard",1072,1,"kaho"; + monster "pay_dun00.gat",0,0,"Flaming Bastard",1072,1,"Flora::OnMobDead"; + monster "pay_dun00.gat",0,0,"Flaming Bastard",1072,1,"Flora::OnMobDead"; close; +OnMobDead: + end; } //4-2; yuno.gat,45,138,6 script Zed 735,{ @@ -439,7 +441,7 @@ N_QuestComp: mes "[Czhore]"; mes "Here have these 2 Treasure Tokens."; mes "And some of my old treasure..."; - monster "prt_gld.gat",155,99,"Old Man's Treasure",1324,1,"treasure"; + monster "prt_gld.gat",155,99,"Old Man's Treasure",1324,1; set four_qset,0; set On_Quest,0; delitem 714,1; @@ -652,7 +654,7 @@ N_QuestComp: mes "Oh dear god!!!"; mes "One of those evil mosters has followed you up here, Kill it, Kill it!!!"; next; - monster "gef_tower.gat",42,89,"Evil Nightmare",1061,1,"nightsum"; + monster "gef_tower.gat",42,89,"Evil Nightmare",1061,1; close; N_QuestStart: mes "[Zuuzuu]"; diff --git a/npc/custom/tougijou.txt b/npc/custom/tougijou.txt index df61dec88..d0576fe63 100644 --- a/npc/custom/tougijou.txt +++ b/npc/custom/tougijou.txt @@ -137,155 +137,155 @@ gon_test.gat,42,89,4 script Summoner 774,{ L1: menu "Dizziness",L1_1,"The Poison Food",L1_2,"Anemia",L1_3,"The Bug",L1_4,"Incision",L1_5,"Rabies",L1_6,"back",L0; L1_1: - monster "gon_test.gat",58,87,"Dizziness",1419,1,"mobend";set $@addmon,1;close; + monster "gon_test.gat",58,87,"Dizziness",1419,1,"mobend::OnMobDead";set $@addmon,1;close; L1_2: - monster "gon_test.gat",58,87,"The Poison Food",1428,1,"mobend";set $@addmon,1;close; + monster "gon_test.gat",58,87,"The Poison Food",1428,1,"mobend::OnMobDead";set $@addmon,1;close; L1_3: - monster "gon_test.gat",58,87,"Anemia",1434,1,"mobend";set $@addmon,1;close; + monster "gon_test.gat",58,87,"Anemia",1434,1,"mobend::OnMobDead";set $@addmon,1;close; L1_4: - monster "gon_test.gat",58,87,"The Bug",1430,1,"mobend";set $@addmon,1;close; + monster "gon_test.gat",58,87,"The Bug",1430,1,"mobend::OnMobDead";set $@addmon,1;close; L1_5: - monster "gon_test.gat",58,87,"Incision",1457,1,"mobend";set $@addmon,1;close; + monster "gon_test.gat",58,87,"Incision",1457,1,"mobend::OnMobDead";set $@addmon,1;close; L1_6: - monster "gon_test.gat",58,87,"Rabies",1432,1,"mobend";set $@addmon,1;close; + monster "gon_test.gat",58,87,"Rabies",1432,1,"mobend::OnMobDead";set $@addmon,1;close; L2: menu "Samael",L2_1,"Toror",L2_2,"Kangeishi",L2_3,"Blackdock",L2_4,"Merou",L2_5,"Kyoushi",L2_6,"back",L0; L2_1: - monster "gon_test.gat",58,87,"Samael",1462,1,"mobend";set $@addmon,1;close; + monster "gon_test.gat",58,87,"Samael",1462,1,"mobend::OnMobDead";set $@addmon,1;close; L2_2: - monster "gon_test.gat",58,87,"Toror",1442,1,"mobend";set $@addmon,1;close; + monster "gon_test.gat",58,87,"Toror",1442,1,"mobend::OnMobDead";set $@addmon,1;close; L2_3: - monster "gon_test.gat",58,87,"Kangeishi",1469,1,"mobend";set $@addmon,1;close; + monster "gon_test.gat",58,87,"Kangeishi",1469,1,"mobend::OnMobDead";set $@addmon,1;close; L2_4: - monster "gon_test.gat",58,87,"Blackdock",1460,1,"mobend";set $@addmon,1;close; + monster "gon_test.gat",58,87,"Blackdock",1460,1,"mobend::OnMobDead";set $@addmon,1;close; L2_5: - monster "gon_test.gat",58,87,"Merou",1425,1,"mobend";set $@addmon,1;close; + monster "gon_test.gat",58,87,"Merou",1425,1,"mobend::OnMobDead";set $@addmon,1;close; L2_6: - monster "gon_test.gat",58,87,"Kyoushi",1472,1,"mobend";set $@addmon,1;close; + monster "gon_test.gat",58,87,"Kyoushi",1472,1,"mobend::OnMobDead";set $@addmon,1;close; L3: menu "Ashimoto",L3_1,"Mushibamu",L3_2,"Sorappo",L3_3,"Freezer",L3_4,"Heat",L3_5,"The Rotten",L3_6,"back",L0; L3_1: - monster "gon_test.gat",58,87,"Ashimoto",1454,1,"mobend";set $@addmon,1;close; + monster "gon_test.gat",58,87,"Ashimoto",1454,1,"mobend::OnMobDead";set $@addmon,1;close; L3_2: - monster "gon_test.gat",58,87,"Mushibamu",1443,1,"mobend";set $@addmon,1;close; + monster "gon_test.gat",58,87,"Mushibamu",1443,1,"mobend::OnMobDead";set $@addmon,1;close; L3_3: - monster "gon_test.gat",58,87,"Sorappo",1455,1,"mobend";set $@addmon,1;close; + monster "gon_test.gat",58,87,"Sorappo",1455,1,"mobend::OnMobDead";set $@addmon,1;close; L3_4: - monster "gon_test.gat",58,87,"Freezer",1426,1,"mobend";set $@addmon,1;close; + monster "gon_test.gat",58,87,"Freezer",1426,1,"mobend::OnMobDead";set $@addmon,1;close; L3_5: - monster "gon_test.gat",58,87,"Heat",1436,1,"mobend";set $@addmon,1;close; + monster "gon_test.gat",58,87,"Heat",1436,1,"mobend::OnMobDead";set $@addmon,1;close; L3_6: - monster "gon_test.gat",58,87,"The Rotten",1423,1,"mobend";set $@addmon,1;close; + monster "gon_test.gat",58,87,"The Rotten",1423,1,"mobend::OnMobDead";set $@addmon,1;close; L4: menu "Priest",L4_1,"Onion",L4_2,"Big Centipede",L4_3,"Marionette",L4_4,"Matchstick Girl",L4_5,"Firefly",L4_6,"back",L0; L4_1: - monster "gon_test.gat",58,87,"Priest",1458,1,"mobend";set $@addmon,1;close; + monster "gon_test.gat",58,87,"Priest",1458,1,"mobend::OnMobDead";set $@addmon,1;close; L4_2: - monster "gon_test.gat",58,87,"Onion",1440,1,"mobend";set $@addmon,1;close; + monster "gon_test.gat",58,87,"Onion",1440,1,"mobend::OnMobDead";set $@addmon,1;close; L4_3: - monster "gon_test.gat",58,87,"Big Centipede",1429,1,"mobend";set $@addmon,1;close; + monster "gon_test.gat",58,87,"Big Centipede",1429,1,"mobend::OnMobDead";set $@addmon,1;close; L4_4: - monster "gon_test.gat",58,87,"Marionette",1459,1,"mobend";set $@addmon,1;close; + monster "gon_test.gat",58,87,"Marionette",1459,1,"mobend::OnMobDead";set $@addmon,1;close; L4_5: - monster "gon_test.gat",58,87,"Matchstick Girl",1444,1,"mobend";set $@addmon,1;close; + monster "gon_test.gat",58,87,"Matchstick Girl",1444,1,"mobend::OnMobDead";set $@addmon,1;close; L4_6: - monster "gon_test.gat",58,87,"Fly",1422,1,"mobend";set $@addmon,1;close; + monster "gon_test.gat",58,87,"Fly",1422,1,"mobend::OnMobDead";set $@addmon,1;close; L5: menu "Femal Curse",L5_1,"Ikitsuchi",L5_2,"Master Snake",L5_3,"Poison Dragon",L5_4,"Seiryuu, the Blue Dragon",L5_5,"Epidemic Devil",L5_6,"back",L0; L5_1: - monster "gon_test.gat",58,87,"Femal Curse",1421,1,"mobend";set $@addmon,1;close; + monster "gon_test.gat",58,87,"Femal Curse",1421,1,"mobend::OnMobDead";set $@addmon,1;close; L5_2: - monster "gon_test.gat",58,87,"Ikitsuchi",1481,1,"mobend";set $@addmon,1;close; + monster "gon_test.gat",58,87,"Ikitsuchi",1481,1,"mobend::OnMobDead";set $@addmon,1;close; L5_3: - monster "gon_test.gat",58,87,"Master Snake",1424,1,"mobend";set $@addmon,1;close; + monster "gon_test.gat",58,87,"Master Snake",1424,1,"mobend::OnMobDead";set $@addmon,1;close; L5_4: - monster "gon_test.gat",58,87,"Poison Dragon",1465,1,"mobend";set $@addmon,1;close; + monster "gon_test.gat",58,87,"Poison Dragon",1465,1,"mobend::OnMobDead";set $@addmon,1;close; L5_5: - monster "gon_test.gat",58,87,"Seiryuu, the Blue Dragon",1466,1,"mobend";set $@addmon,1;close; + monster "gon_test.gat",58,87,"Seiryuu, the Blue Dragon",1466,1,"mobend::OnMobDead";set $@addmon,1;close; L5_6: - monster "gon_test.gat",58,87,"Epidemic Devil",1433,1,"mobend";set $@addmon,1;close; + monster "gon_test.gat",58,87,"Epidemic Devil",1433,1,"mobend::OnMobDead";set $@addmon,1;close; L6: menu "Tapir",L6_1,"Moat Putter",L6_2,"God of Lightning",L6_3,"Revengeing Ghost",L6_4,"Fusoushin",L6_5,"Hanmou",L6_6,"back",L0; L6_1: - monster "gon_test.gat",58,87,"Tapir",1427,1,"mobend";set $@addmon,1;close; + monster "gon_test.gat",58,87,"Tapir",1427,1,"mobend::OnMobDead";set $@addmon,1;close; L6_2: - monster "gon_test.gat",58,87,"Moat Putter",1473,1,"mobend";set $@addmon,1;close; + monster "gon_test.gat",58,87,"Moat Putter",1473,1,"mobend::OnMobDead";set $@addmon,1;close; L6_3: - monster "gon_test.gat",58,87,"God of Lightning",1431,1,"mobend";set $@addmon,1;close; + monster "gon_test.gat",58,87,"God of Lightning",1431,1,"mobend::OnMobDead";set $@addmon,1;close; L6_4: - monster "gon_test.gat",58,87,"Revengeing Ghost",1446,1,"mobend";set $@addmon,1;close; + monster "gon_test.gat",58,87,"Revengeing Ghost",1446,1,"mobend::OnMobDead";set $@addmon,1;close; L6_5: - monster "gon_test.gat",58,87,"Fusoushin",1474,1,"mobend";set $@addmon,1;close; + monster "gon_test.gat",58,87,"Fusoushin",1474,1,"mobend::OnMobDead";set $@addmon,1;close; L6_6: - monster "gon_test.gat",58,87,"Hanmou",1471,1,"mobend";set $@addmon,1;close; + monster "gon_test.gat",58,87,"Hanmou",1471,1,"mobend::OnMobDead";set $@addmon,1;close; L7: menu "Cane",L7_1,"Axe",L7_2,"Big Hammer",L7_3,"Armor",L7_4,"Bow",L7_5,"Iron Bullet",L7_6,"back",L0; L7_1: - monster "gon_test.gat",58,87,"Cane",1450,1,"mobend";set $@addmon,1;close; + monster "gon_test.gat",58,87,"Cane",1450,1,"mobend::OnMobDead";set $@addmon,1;close; L7_2: - monster "gon_test.gat",58,87,"Axe",1439,1,"mobend";set $@addmon,1;close; + monster "gon_test.gat",58,87,"Axe",1439,1,"mobend::OnMobDead";set $@addmon,1;close; L7_3: - monster "gon_test.gat",58,87,"Big Hammer",1461,1,"mobend";set $@addmon,1;close; + monster "gon_test.gat",58,87,"Big Hammer",1461,1,"mobend::OnMobDead";set $@addmon,1;close; L7_4: - monster "gon_test.gat",58,87,"Armor",1467,1,"mobend";set $@addmon,1;close; + monster "gon_test.gat",58,87,"Armor",1467,1,"mobend::OnMobDead";set $@addmon,1;close; L7_5: - monster "gon_test.gat",58,87,"Bow",1453,1,"mobend";set $@addmon,1;close; + monster "gon_test.gat",58,87,"Bow",1453,1,"mobend::OnMobDead";set $@addmon,1;close; L7_6: - monster "gon_test.gat",58,87,"Iron Bullet",1479,1,"mobend";set $@addmon,1;close; + monster "gon_test.gat",58,87,"Iron Bullet",1479,1,"mobend::OnMobDead";set $@addmon,1;close; L8: menu "Lips",L8_1,"Tooth",L8_2,"Hair",L8_3,"The Hand",L8_4,"Muscle",L8_5,"Bone",L8_6,"back",L0; L8_1: - monster "gon_test.gat",58,87,"Lips",1451,1,"mobend";set $@addmon,1;close; + monster "gon_test.gat",58,87,"Lips",1451,1,"mobend::OnMobDead";set $@addmon,1;close; L8_2: - monster "gon_test.gat",58,87,"Tooth",1475,1,"mobend";set $@addmon,1;close; + monster "gon_test.gat",58,87,"Tooth",1475,1,"mobend::OnMobDead";set $@addmon,1;close; L8_3: - monster "gon_test.gat",58,87,"The Hair",1437,1,"mobend";set $@addmon,1;close; + monster "gon_test.gat",58,87,"The Hair",1437,1,"mobend::OnMobDead";set $@addmon,1;close; L8_4: - monster "gon_test.gat",58,87,"Hand",1441,1,"mobend";set $@addmon,1;close; + monster "gon_test.gat",58,87,"Hand",1441,1,"mobend::OnMobDead";set $@addmon,1;close; L8_5: - monster "gon_test.gat",58,87,"Muscle",1476,1,"mobend";set $@addmon,1;close; + monster "gon_test.gat",58,87,"Muscle",1476,1,"mobend::OnMobDead";set $@addmon,1;close; L8_6: - monster "gon_test.gat",58,87,"Bone",1435,1,"mobend";set $@addmon,1;close; + monster "gon_test.gat",58,87,"Bone",1435,1,"mobend::OnMobDead";set $@addmon,1;close; L9: menu "Ball",L9_1,"Mirror",L9_2,"Book",L9_3,"Glove",L9_4,"Bag",L9_5,"Clothes",L9_6,"back",L0; L9_1: - monster "gon_test.gat",58,87,"Ball",1477,1,"mobend";set $@addmon,1;close; + monster "gon_test.gat",58,87,"Ball",1477,1,"mobend::OnMobDead";set $@addmon,1;close; L9_2: - monster "gon_test.gat",58,87,"Mirror",1448,1,"mobend";set $@addmon,1;close; + monster "gon_test.gat",58,87,"Mirror",1448,1,"mobend::OnMobDead";set $@addmon,1;close; L9_3: - monster "gon_test.gat",58,87,"Book",1478,1,"mobend";set $@addmon,1;close; + monster "gon_test.gat",58,87,"Book",1478,1,"mobend::OnMobDead";set $@addmon,1;close; L9_4: - monster "gon_test.gat",58,87,"Glove",1489,1,"mobend";set $@addmon,1;close; + monster "gon_test.gat",58,87,"Glove",1489,1,"mobend::OnMobDead";set $@addmon,1;close; L9_5: - monster "gon_test.gat",58,87,"Bag",1488,1,"mobend";set $@addmon,1;close; + monster "gon_test.gat",58,87,"Bag",1488,1,"mobend::OnMobDead";set $@addmon,1;close; L9_6: - monster "gon_test.gat",58,87,"Clothes",1438,1,"mobend";set $@addmon,1;close; + monster "gon_test.gat",58,87,"Clothes",1438,1,"mobend::OnMobDead";set $@addmon,1;close; L10: menu "The Queen",L10_1,"Hot-Blood-Man",L10_2,"Executioner",L10_3,"Mutant Dragon",L10_4,"Syntetic Beast",L10_5,"Satan",L10_6,"back",L0; L10_1: - monster "gon_test.gat",58,87,"The Queen",1482,1,"mobend";set $@addmon,1;close; + monster "gon_test.gat",58,87,"The Queen",1482,1,"mobend::OnMobDead";set $@addmon,1;close; L10_2: - monster "gon_test.gat",58,87,"Hot-Blood-Man",1464,1,"mobend";set $@addmon,1;close; + monster "gon_test.gat",58,87,"Hot-Blood-Man",1464,1,"mobend::OnMobDead";set $@addmon,1;close; L10_3: - monster "gon_test.gat",58,87,"Executioner",1487,1,"mobend";set $@addmon,1;close; + monster "gon_test.gat",58,87,"Executioner",1487,1,"mobend::OnMobDead";set $@addmon,1;close; L10_4: - monster "gon_test.gat",58,87,"Mutant Dragon",1449,1,"mobend";set $@addmon,1;close; + monster "gon_test.gat",58,87,"Mutant Dragon",1449,1,"mobend::OnMobDead";set $@addmon,1;close; L10_5: - monster "gon_test.gat",58,87,"Syntetic Beast",1456,1,"mobend";set $@addmon,1;close; + monster "gon_test.gat",58,87,"Syntetic Beast",1456,1,"mobend::OnMobDead";set $@addmon,1;close; L10_6: - monster "gon_test.gat",58,87,"Satan",1486,1,"mobend";set $@addmon,1;close; + monster "gon_test.gat",58,87,"Satan",1486,1,"mobend::OnMobDead";set $@addmon,1;close; L11: menu "Hunter",L11_1,"Assassin",L11_2,"Samurai",L11_3,"Budoka",L11_4,"Fencer",L11_5,"back",L0; L11_1: - monster "gon_test.gat",58,87,"Hunter",1447,1,"mobend";set $@addmon,1;close; + monster "gon_test.gat",58,87,"Hunter",1447,1,"mobend::OnMobDead";set $@addmon,1;close; L11_2: - monster "gon_test.gat",58,87,"Assassin",1483,1,"mobend";set $@addmon,1;close; + monster "gon_test.gat",58,87,"Assassin",1483,1,"mobend::OnMobDead";set $@addmon,1;close; L11_3: - monster "gon_test.gat",58,87,"Samurai",1490,1,"mobend";set $@addmon,1;close; + monster "gon_test.gat",58,87,"Samurai",1490,1,"mobend::OnMobDead";set $@addmon,1;close; L11_4: - monster "gon_test.gat",58,87,"Budoka",1484,1,"mobend";set $@addmon,1;close; + monster "gon_test.gat",58,87,"Budoka",1484,1,"mobend::OnMobDead";set $@addmon,1;close; L11_5: - monster "gon_test.gat",58,87,"Fencer",1485,1,"mobend";set $@addmon,1;close; + monster "gon_test.gat",58,87,"Fencer",1485,1,"mobend::OnMobDead";set $@addmon,1;close; Lalready: mes "[Son Yon'u]"; mes "The monster has been summoned already. It is only possible to summon one monster at a time. Please re-enter the arena, if you wish another opponent."; @@ -297,6 +297,7 @@ LError: } //=============================================================================== gon_test.gat,58,87,0 script mobend -1,{ +OnMobDead: mapannounce "gon_test.gat","Summoner: Congratulations.",0; stopnpctimer "gontimer"; addtimer 5000, "mobend::OnReturn"; diff --git a/npc/jobs/2-2/monk.txt b/npc/jobs/2-2/monk.txt index 5b255b515..7847e1d47 100644 --- a/npc/jobs/2-2/monk.txt +++ b/npc/jobs/2-2/monk.txt @@ -1724,7 +1724,7 @@ monk_test.gat,88,91,4 script Test Assistant#01 52,{ mes "Good luck! May God be with you."; next; if(getareausers("monk_test.gat",126,161,165,199) > 0) goto L_WAIT; - killmonster "monk_test.gat","monk_mob1"; + killmonster "monk_test.gat","monk_mob1::OnMobDead"; enablenpc "monk_mob1_1"; enablenpc "monk_mob1_2"; enablenpc "monk_mob1_3"; @@ -1737,37 +1737,38 @@ L_WAIT: close; } monk_test.gat,129,180,4 script monk_mob1_1 139,0,19,{ - monster "monk_test.gat",130,183,"--ja--",1015,1,"monk_mob1"; - monster "monk_test.gat",130,177,"--ja--",1015,1,"monk_mob1"; + monster "monk_test.gat",130,183,"--ja--",1015,1,"monk_mob1::OnMobDead"; + monster "monk_test.gat",130,177,"--ja--",1015,1,"monk_mob1::OnMobDead"; //~ disablenpc "monk_mob1_1"; end; } monk_test.gat,133,180,4 script monk_mob1_2 139,0,19,{ - monster "monk_test.gat",134,183,"--ja--",1015,1,"monk_mob1"; - monster "monk_test.gat",134,177,"--ja--",1015,1,"monk_mob1"; + monster "monk_test.gat",134,183,"--ja--",1015,1,"monk_mob1::OnMobDead"; + monster "monk_test.gat",134,177,"--ja--",1015,1,"monk_mob1::OnMobDead"; //~ disablenpc "monk_mob1_2"; end; } monk_test.gat,145,180,4 script monk_mob1_3 139,0,19,{ - monster "monk_test.gat",145,180,"--ja--",1041,1,"monk_mob1"; + monster "monk_test.gat",145,180,"--ja--",1041,1,"monk_mob1::OnMobDead"; //~ disablenpc "monk_mob1_3"; end; } monk_test.gat,155,180,4 script monk_mob1_4 139,0,19,{ - monster "monk_test.gat",157,183,"--ja--",1015,1,"monk_mob1"; - monster "monk_test.gat",157,177,"--ja--",1015,1,"monk_mob1"; + monster "monk_test.gat",157,183,"--ja--",1015,1,"monk_mob1::OnMobDead"; + monster "monk_test.gat",157,177,"--ja--",1015,1,"monk_mob1::OnMobDead"; //~ disablenpc "monk_mob1_4"; end; } monk_test.gat,165,179,4 script monk_mob3_warp#01 45,1,1,{ set MONK_Q, 9; mapannounce "monk_test.gat","Congratulations!!" + strcharinfo(0)+ " Passes!! Please go to [Daowen], he is deep inside the building.",8; - killmonster "monk_test.gat","monk_mob1"; + killmonster "monk_test.gat","monk_mob1::OnMobDead"; warp "monk_test.gat",317,142; end; } monk_test.gat,1,1,1 script monk_mob1 -1,{ +OnMobDead: end; } @@ -1784,7 +1785,7 @@ monk_test.gat,95,85,4 script Test Assistant#02 79,{ mes "Good luck! May God be with you."; next; if(getareausers("monk_test.gat",126,262,165,300) > 0) goto L_WAIT; - killmonster "monk_test.gat","monk_mob2"; + killmonster "monk_test.gat","monk_mob2::OnMobDead"; enablenpc "monk_mob2_1"; enablenpc "monk_mob2_2"; enablenpc "monk_mob2_3"; @@ -1799,37 +1800,38 @@ L_WAIT: } monk_test.gat,129,281,4 script monk_mob2_1 139,0,19,{ - monster "monk_test.gat",130,278,"--ja--",1015,1,"monk_mob2"; - monster "monk_test.gat",130,284,"--ja--",1015,1,"monk_mob2"; + monster "monk_test.gat",130,278,"--ja--",1015,1,"monk_mob2::OnMobDead"; + monster "monk_test.gat",130,284,"--ja--",1015,1,"monk_mob2::OnMobDead"; //~ disablenpc "monk_mob2_1"; end; } monk_test.gat,136,281,4 script monk_mob2_2 139,0,19,{ - monster "monk_test.gat",139,278,"--ja--",1015,1,"monk_mob2"; - monster "monk_test.gat",139,284,"--ja--",1015,1,"monk_mob2"; + monster "monk_test.gat",139,278,"--ja--",1015,1,"monk_mob2::OnMobDead"; + monster "monk_test.gat",139,284,"--ja--",1015,1,"monk_mob2::OnMobDead"; //~ disablenpc "monk_mob2_2"; end; } monk_test.gat,144,281,4 script monk_mob2_3 139,0,19,{ - monster "monk_test.gat",145,281,"--ja--",1041,1,"monk_mob2"; + monster "monk_test.gat",145,281,"--ja--",1041,1,"monk_mob2::OnMobDead"; //~ disablenpc "monk_mob2_3"; end; } monk_test.gat,153,281,4 script monk_mob2_4 139,0,19,{ - monster "monk_test.gat",155,278,"--ja--",1015,1,"monk_mob2"; - monster "monk_test.gat",155,284,"--ja--",1015,1,"monk_mob2"; + monster "monk_test.gat",155,278,"--ja--",1015,1,"monk_mob2::OnMobDead"; + monster "monk_test.gat",155,284,"--ja--",1015,1,"monk_mob2::OnMobDead"; //~ disablenpc "monk_mob2_4"; end; } monk_test.gat,165,278,4 script monk_mob2_warp 45,1,1,{ set MONK_Q, 9; mapannounce "monk_test.gat","Congratulations!!" + strcharinfo(0)+ " Passes!! Please go to [Daowen], he is deep inside the building.",8; - killmonster "monk_test.gat","monk_mob2"; + killmonster "monk_test.gat","monk_mob2::OnMobDead"; warp "monk_test.gat",317,142; end; } monk_test.gat,1,1,1 script monk_mob2 -1,{ +OnMobDead: end; } @@ -1846,7 +1848,7 @@ monk_test.gat,82,85,4 script Test Assistant#03 95,{ mes "Good luck! May God be with you."; next; if(getareausers("monk_test.gat",233,262,269,300) > 0) goto L_WAIT; - killmonster "monk_test.gat","monk_mob3"; + killmonster "monk_test.gat","monk_mob3::OnMobDead"; enablenpc "monk_mob3_1"; enablenpc "monk_mob3_2"; enablenpc "monk_mob3_3"; @@ -1861,35 +1863,39 @@ L_WAIT: } monk_test.gat,234,281,4 script monk_mob3_1 139,0,19,{ - monster "monk_test.gat",235,277,"--ja--",1015,1,"monk_mob3"; - monster "monk_test.gat",235,284,"--ja--",1015,1,"monk_mob3"; + monster "monk_test.gat",235,277,"--ja--",1015,1,"monk_mob3::OnMobDead"; + monster "monk_test.gat",235,284,"--ja--",1015,1,"monk_mob3::OnMobDead"; //~ disablenpc "monk_mob3_1"; end; } monk_test.gat,239,281,4 script monk_mob3_2 139,0,19,{ - monster "monk_test.gat",240,277,"--ja--",1015,1,"monk_mob3"; - monster "monk_test.gat",240,284,"--ja--",1015,1,"monk_mob3"; + monster "monk_test.gat",240,277,"--ja--",1015,1,"monk_mob3::OnMobDead"; + monster "monk_test.gat",240,284,"--ja--",1015,1,"monk_mob3::OnMobDead"; //~ disablenpc "monk_mob3_2"; end; } monk_test.gat,248,281,4 script monk_mob3_3 139,0,19,{ - monster "monk_test.gat",249,281,"--ja--",1041,1,"monk_mob3"; + monster "monk_test.gat",249,281,"--ja--",1041,1,"monk_mob3::OnMobDead"; //~ disablenpc "monk_mob3_3"; end; } monk_test.gat,260,281,4 script monk_mob3_4 139,0,19,{ - monster "monk_test.gat",261,277,"--ja--",1015,1,"monk_mob3"; - monster "monk_test.gat",261,284,"--ja--",1015,1,"monk_mob3"; + monster "monk_test.gat",261,277,"--ja--",1015,1,"monk_mob3::OnMobDead"; + monster "monk_test.gat",261,284,"--ja--",1015,1,"monk_mob3::OnMobDead"; //~ disablenpc "monk_mob3_4"; end; } monk_test.gat,269,279,4 script monk_mob3_warp#02 45,1,1,{ set MONK_Q, 9; mapannounce "monk_test.gat","Congratulations!!" + strcharinfo(0)+ " Passes!! Please go to [Daowen], he is deep inside the building.",8; - killmonster "monk_test.gat","monk_mob3"; + killmonster "monk_test.gat","monk_mob3::OnMobDead"; warp "monk_test.gat",317,142; end; } +monk_test.gat,1,1,1 script monk_mob3 -1,{ +OnMobDead: + end; +} //============================================================================== diff --git a/npc/other/arena.txt b/npc/other/arena.txt index f64398ef5..26e47415c 100644 --- a/npc/other/arena.txt +++ b/npc/other/arena.txt @@ -93,14 +93,14 @@ force_1-1.gat,99,12,0 script arenalv3st -1,{ // Transmission to the room, and mob organization //Time Attack Level 1 force_1-1.gat,99,12,0 script arenalv1fgt -1,{ - killmonster "force_1-1.gat","arenalv1mon"; - killmonster "force_1-1.gat","arenalv2mon"; - killmonster "force_1-1.gat","arenalv3mon"; - monster "force_1-1.gat",25,25,"Arena Enemy",1002,1,"arenalv1mon"; - monster "force_1-1.gat",20,25,"Arena Enemy",1002,1,"arenalv1mon"; - monster "force_1-1.gat",25,20,"Arena Enemy",1002,1,"arenalv1mon"; - monster "force_1-1.gat",30,25,"Arena Enemy",1002,1,"arenalv1mon"; - monster "force_1-1.gat",25,30,"Arena Enemy",1002,1,"arenalv1mon"; + killmonster "force_1-1.gat","arenalv1fgt::arenalv1mon"; + killmonster "force_1-1.gat","arenalv2fgt::arenalv2mon"; + killmonster "force_1-1.gat","arenalv3fgt::arenalv3mon"; + monster "force_1-1.gat",25,25,"Arena Enemy",1002,1,"arenalv1fgt::arenalv1mon"; + monster "force_1-1.gat",20,25,"Arena Enemy",1002,1,"arenalv1fgt::arenalv1mon"; + monster "force_1-1.gat",25,20,"Arena Enemy",1002,1,"arenalv1fgt::arenalv1mon"; + monster "force_1-1.gat",30,25,"Arena Enemy",1002,1,"arenalv1fgt::arenalv1mon"; + monster "force_1-1.gat",25,30,"Arena Enemy",1002,1,"arenalv1fgt::arenalv1mon"; set $arena00,5; disablenpc "fc101"; disablenpc "fc103"; @@ -111,21 +111,23 @@ force_1-1.gat,99,12,0 script arenalv1fgt -1,{ announce "Do it within 30 seconds!",19; addtimer 30000,"arenalv1fail"; addtimer 20000,"tensecsleft"; +arenalv1mon: + end; } //Time Attack Level 2 force_1-1.gat,99,12,0 script arenalv2fgt -1,{ - killmonster "force_1-1.gat","arenalv1mon"; - killmonster "force_1-1.gat","arenalv2mon"; - killmonster "force_1-1.gat","arenalv3mon"; - monster "force_1-1.gat",20,20,"Arena Enemy",1012,1,"arenalv2mon"; - monster "force_1-1.gat",20,25,"Arena Enemy",1012,1,"arenalv2mon"; - monster "force_1-1.gat",20,30,"Arena Enemy",1012,1,"arenalv2mon"; - monster "force_1-1.gat",30,20,"Arena Enemy",1012,1,"arenalv2mon"; - monster "force_1-1.gat",30,25,"Arena Enemy",1012,1,"arenalv2mon"; - monster "force_1-1.gat",30,30,"Arena Enemy",1012,1,"arenalv2mon"; - monster "force_1-1.gat",25,30,"Arena Enemy",1012,1,"arenalv2mon"; - monster "force_1-1.gat",25,20,"Arena Enemy",1012,1,"arenalv2mon"; + killmonster "force_1-1.gat","arenalv1fgt::arenalv1mon"; + killmonster "force_1-1.gat","arenalv2fgt::arenalv2mon"; + killmonster "force_1-1.gat","arenalv3fgt::arenalv3mon"; + monster "force_1-1.gat",20,20,"Arena Enemy",1012,1,"arenalv2fgt::arenalv2mon"; + monster "force_1-1.gat",20,25,"Arena Enemy",1012,1,"arenalv2fgt::arenalv2mon"; + monster "force_1-1.gat",20,30,"Arena Enemy",1012,1,"arenalv2fgt::arenalv2mon"; + monster "force_1-1.gat",30,20,"Arena Enemy",1012,1,"arenalv2fgt::arenalv2mon"; + monster "force_1-1.gat",30,25,"Arena Enemy",1012,1,"arenalv2fgt::arenalv2mon"; + monster "force_1-1.gat",30,30,"Arena Enemy",1012,1,"arenalv2fgt::arenalv2mon"; + monster "force_1-1.gat",25,30,"Arena Enemy",1012,1,"arenalv2fgt::arenalv2mon"; + monster "force_1-1.gat",25,20,"Arena Enemy",1012,1,"arenalv2fgt::arenalv2mon"; set $arena00,7; disablenpc "fc101"; disablenpc "fc103"; @@ -136,23 +138,25 @@ force_1-1.gat,99,12,0 script arenalv2fgt -1,{ announce "You have 60 seconds to destroy all seven!",19; addtimer 60000,"arenalv2fail"; addtimer 50000,"tensecsleft"; +arenalv2mon: + end; } //Time Attack Level 3 force_1-1.gat,99,12,0 script arenalv3fgt -1,{ - killmonster "force_1-1.gat","arenalv1mon"; - killmonster "force_1-1.gat","arenalv2mon"; - killmonster "force_1-1.gat","arenalv3mon"; - monster "force_1-1.gat",20,20,"Arena Enemy",1019,1,"arenalv3mon"; - monster "force_1-1.gat",20,25,"Arena Enemy",1019,1,"arenalv3mon"; - monster "force_1-1.gat",20,30,"Arena Enemy",1019,1,"arenalv3mon"; - monster "force_1-1.gat",30,20,"Arena Enemy",1019,1,"arenalv3mon"; - monster "force_1-1.gat",30,25,"Arena Enemy",1019,1,"arenalv3mon"; - monster "force_1-1.gat",30,30,"Arena Enemy",1019,1,"arenalv3mon"; - monster "force_1-1.gat",25,30,"Arena Enemy",1019,1,"arenalv3mon"; - monster "force_1-1.gat",25,25,"Arena Enemy",1019,1,"arenalv3mon"; - monster "force_1-1.gat",25,20,"Arena Enemy",1019,1,"arenalv3mon"; - monster "force_1-1.gat",20,35,"Arena Enemy",1019,1,"arenalv3mon"; + killmonster "force_1-1.gat","arenalv1fgt::arenalv1mon"; + killmonster "force_1-1.gat","arenalv2fgt::arenalv2mon"; + killmonster "force_1-1.gat","arenalv3fgt::arenalv3mon"; + monster "force_1-1.gat",20,20,"Arena Enemy",1019,1,"arenalv3fgt::arenalv3mon"; + monster "force_1-1.gat",20,25,"Arena Enemy",1019,1,"arenalv3fgt::arenalv3mon"; + monster "force_1-1.gat",20,30,"Arena Enemy",1019,1,"arenalv3fgt::arenalv3mon"; + monster "force_1-1.gat",30,20,"Arena Enemy",1019,1,"arenalv3fgt::arenalv3mon"; + monster "force_1-1.gat",30,25,"Arena Enemy",1019,1,"arenalv3fgt::arenalv3mon"; + monster "force_1-1.gat",30,30,"Arena Enemy",1019,1,"arenalv3fgt::arenalv3mon"; + monster "force_1-1.gat",25,30,"Arena Enemy",1019,1,"arenalv3fgt::arenalv3mon"; + monster "force_1-1.gat",25,25,"Arena Enemy",1019,1,"arenalv3fgt::arenalv3mon"; + monster "force_1-1.gat",25,20,"Arena Enemy",1019,1,"arenalv3fgt::arenalv3mon"; + monster "force_1-1.gat",20,35,"Arena Enemy",1019,1,"arenalv3fgt::arenalv3mon"; set $arena00,9; disablenpc "fc101"; disablenpc "fc103"; @@ -163,6 +167,8 @@ force_1-1.gat,99,12,0 script arenalv3fgt -1,{ announce "You have 90 seconds to destroy all nine!",19; addtimer 90000,"arenalv3fail"; addtimer 80000,"tensecsleft"; +arenalv3mon: + end; } // Pushed-down Processing @@ -369,9 +375,9 @@ L_CONT: // Timeout force_1-1.gat,25,26,0 script arenalv1fail -1,{ set $arena00,99; - killmonster "force_1-1.gat","arenalv1mon"; - killmonster "force_1-1.gat","arenalv2mon"; - killmonster "force_1-1.gat","arenalv3mon"; + killmonster "force_1-1.gat","arenalv1fgt::arenalv1mon"; + killmonster "force_1-1.gat","arenalv2fgt::arenalv2mon"; + killmonster "force_1-1.gat","arenalv3fgt::arenalv3mon"; announce "Time Over!!",3; areaannounce "force_1-1.gat",0,0,350,350, "You failed Time Attack Level 1.",0; @@ -432,9 +438,9 @@ force_1-1.gat,25,26,0 script arenalv1fail -1,{ force_1-1.gat,25,26,0 script arenalv2fail -1,{ set $arena00,99; - killmonster "force_1-1.gat","arenalv1mon"; - killmonster "force_1-1.gat","arenalv2mon"; - killmonster "force_1-1.gat","arenalv3mon"; + killmonster "force_1-1.gat","arenalv1fgt::arenalv1mon"; + killmonster "force_1-1.gat","arenalv2fgt::arenalv2mon"; + killmonster "force_1-1.gat","arenalv3fgt::arenalv3mon"; announce "Time Over!!",3; areaannounce "force_1-1.gat",0,0,350,350, "You failed Time Attack Level 2.",0; @@ -495,9 +501,9 @@ force_1-1.gat,25,26,0 script arenalv2fail -1,{ force_1-1.gat,25,26,0 script arenalv3fail -1,{ set $arena00,99; - killmonster "force_1-1.gat","arenalv1mon"; - killmonster "force_1-1.gat","arenalv2mon"; - killmonster "force_1-1.gat","arenalv3mon"; + killmonster "force_1-1.gat","arenalv1fgt::arenalv1mon"; + killmonster "force_1-1.gat","arenalv2fgt::arenalv2mon"; + killmonster "force_1-1.gat","arenalv3fgt::arenalv3mon"; announce "Time Over!!",3; areaannounce "force_1-1.gat",0,0,350,350, "You failed Time Attack Level 2.",0; diff --git a/npc/quests/The_Sign_Quest.txt b/npc/quests/The_Sign_Quest.txt index 1188090f1..91f17ee83 100644 --- a/npc/quests/The_Sign_Quest.txt +++ b/npc/quests/The_Sign_Quest.txt @@ -7610,14 +7610,14 @@ L_Check: mes "Muhahahahahaha!"; mes "That's not the right spell!"; mes "Now death awaits you!"; - killmonster "niflheim.gat","#signbruce::Onmymob2"; - monster "niflheim.gat",349,256,"Orc Skeleton",1462,1,"#signbruce::Onmymob2"; - monster "niflheim.gat",347,258,"Orc Skeleton",1462,1,"#signbruce::Onmymob2"; - monster "niflheim.gat",347,254,"Orc Skeleton",1462,1,"#signbruce::Onmymob2"; - monster "niflheim.gat",350,252,"Orc Skeleton",1462,1,"#signbruce::Onmymob2"; - monster "niflheim.gat",344,255,"Orc Skeleton",1462,1,"#signbruce::Onmymob2"; - monster "niflheim.gat",348,252,"Orc Skeleton",1462,1,"#signbruce::Onmymob2"; - monster "niflheim.gat",347,259,"Orc Skeleton",1462,1,"#signbruce::Onmymob2"; + killmonster "niflheim.gat","#signbruce::Onmymob"; + monster "niflheim.gat",349,256,"Orc Skeleton",1462,1,"#signbruce::Onmymob"; + monster "niflheim.gat",347,258,"Orc Skeleton",1462,1,"#signbruce::Onmymob"; + monster "niflheim.gat",347,254,"Orc Skeleton",1462,1,"#signbruce::Onmymob"; + monster "niflheim.gat",350,252,"Orc Skeleton",1462,1,"#signbruce::Onmymob"; + monster "niflheim.gat",344,255,"Orc Skeleton",1462,1,"#signbruce::Onmymob"; + monster "niflheim.gat",348,252,"Orc Skeleton",1462,1,"#signbruce::Onmymob"; + monster "niflheim.gat",347,259,"Orc Skeleton",1462,1,"#signbruce::Onmymob"; close; L_Success: diff --git a/npc/quests/newgears/2004_headgears.txt b/npc/quests/newgears/2004_headgears.txt index f84129c4b..cb0933369 100644 --- a/npc/quests/newgears/2004_headgears.txt +++ b/npc/quests/newgears/2004_headgears.txt @@ -2298,7 +2298,7 @@ OnInit: end; OnReset: - killmonster "pay_dun03.gat","NT::OnMobDeadGlobal"; + killmonster "pay_dun03.gat","NT::OnMobDead"; disablenpc "Nine Tail#1"; disablenpc "Nine Tail#2"; initnpctimer; -- cgit v1.2.3-60-g2f50