From f56c3b371fa200126e0b8bbd4d5ba4b567df7a15 Mon Sep 17 00:00:00 2001 From: HoraK-FDF Date: Tue, 6 Sep 2022 23:05:47 +0200 Subject: fluffy event changes --- world/map/conf/atcommand_athena.conf | 16 ++++----- world/map/db/const-quest.txt | 1 + world/map/db/item_db_head.txt | 2 +- world/map/npc/033-1/kimarr.txt | 64 ++++++++++++++++++++++++++++++++---- 4 files changed, 68 insertions(+), 15 deletions(-) diff --git a/world/map/conf/atcommand_athena.conf b/world/map/conf/atcommand_athena.conf index 13e0a9bd..07eb2efe 100644 --- a/world/map/conf/atcommand_athena.conf +++ b/world/map/conf/atcommand_athena.conf @@ -5,6 +5,10 @@ help: 0 servertime: 0 email: 0 pvp: 0 +item: 0 +storage: 0 +warp: 0 +zeny: 0 //gm: 100 // 40: developers @@ -21,11 +25,8 @@ whomap: 40 whomapgroup: 40 whogm: 40 charstats: 40 -heal: 40 -hide: 40 jump: 40 return: 40 -warp: 40 dye: 40 ccolor: 40 hairstyle: 40 @@ -38,6 +39,7 @@ tee: 40 t: 40 // 50: event coordinators +hide: 58 invisible: 50 visible: 50 spawn: 50 @@ -55,8 +57,6 @@ killmonster: 60 ipcheck: 60 storeall: 60 alive: 60 -blvl: 60 -jlvl: 60 charbaselvl: 60 charchangesex: 60 chardelitem: 60 @@ -72,12 +72,15 @@ kill: 60 recall: 60 revive: 60 charwarp: 60 +heal: 60 str: 60 agi: 60 vit: 60 int: 60 dex: 60 luk: 60 +blvl: 60 +jlvl: 60 allstats: 60 stpoint: 60 skpoint: 60 @@ -94,7 +97,6 @@ linus: 60 setmagic: 80 magicinfo: 80 option: 80 -zeny: 80 charzeny: 80 charoption: 80 addwarp: 80 @@ -108,7 +110,6 @@ disablenpc: 80 npcmove: 80 lostskill: 80 idsearch: 80 -item: 80 itemcheck: 80 // 98: server admin @@ -130,7 +131,6 @@ mapexit: 98 gat: 98 packet: 98 mapinfo: 98 -storage: 98 // local settings for this server in this file import: conf/atcommand_local.conf diff --git a/world/map/db/const-quest.txt b/world/map/db/const-quest.txt index 5d287666..7f232a4e 100644 --- a/world/map/db/const-quest.txt +++ b/world/map/db/const-quest.txt @@ -159,6 +159,7 @@ OPT_BANK_GOTSHADE 4 // Currently used by the fluffy hunt (033-1). // starts counting with 0 MAX_HIGH_SCORES 14 +MAX_HIGH_SCORES_CRC 24 // Launcher/Ammo Types AMMO_NONE 0 diff --git a/world/map/db/item_db_head.txt b/world/map/db/item_db_head.txt index 122cd0c4..36ead6c7 100644 --- a/world/map/db/item_db_head.txt +++ b/world/map/db/item_db_head.txt @@ -35,7 +35,7 @@ //ID, Name___________________, Type, Price, Sell, Weight, ATK, DEF, Range, Mbonus, Slot, Gender, Loc, wLV, eLV, View, {UseScript}, {EquipScript} 721, HighPriestCrown, 5, 6000000, 5000, 400, 0, 4, 0, 20, 0, 2, 256, 0, 0, 0, {}, {bonus bMaxSP, 20;} 722, MonsterSkullHelmet, 5, 6000000, 3000, 250, 0, 7, 0, 10, 0, 2, 256, 0, 0, 0, {}, {bonus bMdef, 20;} -723, DesertHat, 5, 2400, 600, 20, 0, 3, 0, -1, 0, 2, 256, 0, 0, 0, {}, {} +//723, DesertHat, 5, 2400, 600, 20, 0, 3, 0, -1, 0, 2, 256, 0, 0, 0, {}, {} 724, CottonHeadband, 5, 3000, 500, 5, 0, 2, 0, 0, 0, 2, 256, 0, 0, 0, {}, {} 725, GMCap, 5, 2000, 500, 20, 0, 5, 0, 5, 0, 2, 256, 0, 0, 0, {}, {callfunc "RestrictedItem";} 751, PinkieHat, 5, 5000, 1000, 5, 0, 1, 0, 1, 0, 2, 256, 0, 0, 0, {}, {} diff --git a/world/map/npc/033-1/kimarr.txt b/world/map/npc/033-1/kimarr.txt index 8a16ab93..558f8990 100644 --- a/world/map/npc/033-1/kimarr.txt +++ b/world/map/npc/033-1/kimarr.txt @@ -97,6 +97,8 @@ L_Ask: goto L_WithoutEvent; L_WithEvent: + if (BaseLevel != 99) + goto L_WrongLevel; mes "[Kimarr]"; mes "\"So, are you going to try?\""; menu @@ -104,8 +106,55 @@ L_WithEvent: "Could you explain again?",L_ExplainGame, "Can you tell me who were the most successful Fluffy hunters?",L_ShowRecord, "On the event, who were the most successful Fluffy hunters?",L_CRC_ShowRecord, + "Can you bring me in shape for this event?",L_BringInShape, "Maybe later.",L_Close; +L_WrongLevel: + mes "[Kimarr]"; + mes "For this event you must be level 99!"; + mes "I can bring you on that level and give you all focus and magic skills if you want?"; + goto L_SureBringInShape; + +L_BringInShape: + mes "[Kimarr]"; + mes "I can give you all focus and magic skills if you want?"; + goto L_SureBringInShape; + +L_SureBringInShape: + mes "But you must set your stats again and maybe focus somewhere."; + mes "Are you sure?"; + menu + "Yes, do it!",L_GiveAllAndReset, + "No.",L_Close; + +L_GiveAllAndReset: + set @debug_mask, 65535; + set @debug_shift, 0; + setskill SKILL_EMOTE, 1; + setskill SKILL_TRADE, 1; + setskill SKILL_PARTY, 2; + setskill SKILL_POOL, 1; + setskill SKILL_MALLARDS_EYE, 9; + setskill SKILL_BRAWLING, 9; + setskill SKILL_SPEED, 9; + setskill SKILL_RESIST_POISON, 9; + setskill SKILL_ASTRAL_SOUL, 9; + setskill SKILL_RAGING, 9; + setskill SKILL_MAGIC, 2; + setskill SKILL_MAGIC_LIFE, 2; + setskill SKILL_MAGIC_WAR, 2; + setskill SKILL_MAGIC_TRANSMUTE, 2; + setskill SKILL_MAGIC_NATURE, 2; + setskill SKILL_MAGIC_ASTRAL, 2; + setskill SKILL_MAGIC_DARK, 2; + set MAGIC_EXPERIENCE, + (MAGIC_EXPERIENCE & ~(@debug_mask)) + | (@mexp << @debug_shift); + resetstatus; + set BaseLevel, 99; + + goto L_Close; + L_WithoutEvent: mes "[Kimarr]"; mes "\"So, are you going to try?\""; @@ -168,12 +217,15 @@ L_Again: goto L_AgainWithoutEvent; L_AgainWithEvent: + if (BaseLevel != 99) + goto L_WrongLevel; mes "[Kimarr]"; mes "\"Does the hunter " + strcharinfo(0) + " want to hunt some Fluffies again?\""; menu "Yeah!",L_Game, "Can you tell me who were the most successful Fluffy hunters?",L_ShowRecord, "On the event, who were the most successful Fluffy hunters?",L_CRC_ShowRecord, + "Can you bring me in shape for this event?",L_SureBringInShape, "Not now.",L_Close; L_AgainWithoutEvent: @@ -297,11 +349,11 @@ L_SpawnFluffies: areamonster "033-1", 79, 29, 88, 42, "", 1089, $@Fluffy_Spawn, "Kimarr::OnFluffyDeath"; set $@Fluffy_Extra, 5 * @Fluffy_XmasCake + 3 * @Fluffy_Cake + 12 * ($@Fluffy_Alive + $@Fluffy_Spawn) + 7 * BaseLevel; - if ((BaseLevel > 40) && (rand($@Fluffy_Extra) > 500)) // Ice Goblin + if ((BaseLevel > 40) && (rand($@Fluffy_Extra) > 500) && ($@KIMARR_EVENT < 1)) // Ice Goblin areamonster "033-1", 79, 29, 88, 42, "", 1058, 1, "Kimarr::OnIceGoblinDeath"; - if ((BaseLevel > 60) && (rand($@Fluffy_Extra) > 550)) // Wolvern + if ((BaseLevel > 60) && (rand($@Fluffy_Extra) > 550) && ($@KIMARR_EVENT < 1)) // Wolvern areamonster "033-1", 79, 29, 88, 42, "", 1090, 1, "Kimarr::OnWolvernDeath"; - if ((BaseLevel > 70) && (rand($@Fluffy_Extra) > 600)) // Yeti + if ((BaseLevel > 70) && (rand($@Fluffy_Extra) > 600) && ($@KIMARR_EVENT < 1)) // Yeti areamonster "033-1", 79, 29, 88, 42, "", 1072, 1, "Kimarr::OnYetiDeath"; set $@Fluffy_Extra, 0; @@ -477,7 +529,7 @@ L_CRC_MaybeInsertNext: if (strcharinfo(0) == $Record_CRC_Fluffy_Name$[@rank]) goto L_CRC_MaybeRecordScore; set @rank, @rank + 1; - if (@rank == MAX_HIGH_SCORES) + if (@rank == MAX_HIGH_SCORES_CRC) goto L_CRC_MaybeRecordScore; goto L_CRC_MaybeInsertNext; @@ -492,7 +544,7 @@ L_CRC_FindLastScore: goto L_CRC_MoveStuff; set @loop, @loop + 1; - if (@loop == MAX_HIGH_SCORES) + if (@loop == MAX_HIGH_SCORES_CRC) goto L_CRC_MoveStuff; goto L_CRC_FindLastScore; @@ -524,7 +576,7 @@ L_CRC_ShowNextRecord: goto L_Close; mes (@loop + 1) + " - " + $Record_CRC_Fluffy_Name$[@loop] + " - " + $Record_CRC_Fluffy_Kills[@loop] + " Fluffies killed at " + $Record_CRC_Fluffy_Date$[@loop]; set @loop, @loop + 1; - if (MAX_HIGH_SCORES > 4 && (@loop % 5) == 0 && $Record_CRC_Fluffy_Kills[@loop] > 0) + if (MAX_HIGH_SCORES_CRC > 4 && (@loop % 5) == 0 && $Record_CRC_Fluffy_Kills[@loop] > 0) goto L_CRC_NextShowNextRecord; goto L_CRC_ShowNextRecord; -- cgit v1.2.3-60-g2f50