From 8cf8c00f612fa571512108c9454cd4ed2bfc40df Mon Sep 17 00:00:00 2001 From: HoraK-FDF Date: Mon, 27 Nov 2023 20:05:27 +0000 Subject: xmas dailys fix --- world/map/npc/030-2/storage_helper.txt | 10 ++-- world/map/npc/030-4/mana_battery.txt | 94 ++++++++++++++++++++++++++++++++-- world/map/npc/annuals/xmas/config.txt | 2 +- world/map/npc/annuals/xmas/core.txt | 2 +- world/map/npc/functions/dailyquest.txt | 2 +- 5 files changed, 96 insertions(+), 14 deletions(-) diff --git a/world/map/npc/030-2/storage_helper.txt b/world/map/npc/030-2/storage_helper.txt index d1c3f357..168937e8 100644 --- a/world/map/npc/030-2/storage_helper.txt +++ b/world/map/npc/030-2/storage_helper.txt @@ -69,7 +69,7 @@ L_Helping: next; menu "Give " + $@xmas_good_friendly_name$, L_GoodCandy, - "Give " + $@xmas_bad_friendly_name$ + "(What? how mean!).", L_BadCandy; + "Give " + $@xmas_bad_friendly_name$ + " (What? how mean!).", L_BadCandy; L_BadCandy: set @dq_level, $@xmas_bad_level; @@ -81,9 +81,7 @@ L_BadCandy: set @dq_exp, $@xmas_bad_exp; callfunc "DailyQuest"; - if (countitem(@dq_name$) < @dq_count) - goto L_Close; - set @karma_bonus, $@xmas_karma_bonus; + set @karma_bonus, $@xmas_karma_bonus * @multipler; callfunc "XmasNaughty"; goto L_Close; @@ -97,9 +95,7 @@ L_GoodCandy: set @dq_exp, $@xmas_good_exp; callfunc "DailyQuest"; - if (countitem(@dq_name$) < @dq_count) - goto L_Close; - set @karma_bonus, $@xmas_karma_bonus; + set @karma_bonus, $@xmas_karma_bonus * @multipler; callfunc "XmasNice"; goto L_Close; diff --git a/world/map/npc/030-4/mana_battery.txt b/world/map/npc/030-4/mana_battery.txt index 9499507a..c5c73943 100644 --- a/world/map/npc/030-4/mana_battery.txt +++ b/world/map/npc/030-4/mana_battery.txt @@ -18,7 +18,7 @@ // player gets state set to finished for winning the battle once and mode bit set on easy/hard accordingly // every player *is* allowed to restart the quest ONCE himself if he hasnt started it himself yet -//TODO Add an icreasing particle effect to the chest, move it half a tile right +// TODO Add an icreasing particle effect to the chest, move it half a tile right // and make it one of those lab tables from the slime quests 030-4,32,21,0|script|AniManOMat|400 @@ -212,7 +212,9 @@ L_CaveLogic: L_NextWave: set $@BombTimer, 0; - set $@DangerCellNumber, rand(8); + disablenpc "#DC" + $@DangerCellNumber; + set $@DangerCellNumber, rand(9); + enablenpc "#DC" + $@DangerCellNumber; set $@XmasBossRound, $@XmasBossRound + 1; if (($@XmasBossRound > 10) && ((mobcount("030-4", "AniManOMat::OnGuardDeath") + 1) == 0)) goto L_Finished; @@ -294,6 +296,7 @@ L_Finished: goto L_CleanUp; L_CleanUp: + disablenpc "#DC" + $@DangerCellNumber; areatimer 0, "030-4", 0, 0, 50, 50, 10, "AniManOMat::OnReward"; set $@XmasBossPlayerCount, 0; set $@XmasBossRound, 0; @@ -319,7 +322,7 @@ OnReward: set @xmas_state, $@xmas_reward_start; callfunc "XmasSetState"; set @xmas_state, 0; - //following line seems to do nothing since xmas_boss_bonus is not defined anywhere + // following line seems to do nothing since xmas_boss_bonus is not defined anywhere set @karma_bonus, $@xmas_boss_bonus; message strcharinfo(0), "Wow, what happened here?."; goto L_End; @@ -406,7 +409,7 @@ L_Restart: end; S_Announce: - mapannounce "030-4", "Danger Cell Activated. Zone " + $@DangerCellNumber + " activated.", 0; + mapannounce "030-4", "Danger Cell Activated. Zone " + ($@DangerCellNumber + 1) + " activated.", 0; mapannounce "030-4", $@msg$, 0; mapannounce "030-2", $@msg$, 0; set $@msg$, ""; @@ -453,3 +456,86 @@ OnTimer120000: stopnpctimer; end; } + +// Danger Cells + +// 0: 19,20,29,29 +030-4,24,26,0|script|#DC0|434 +{ + end; + OnInit: + disablenpc "#DC0"; + end; +} + +// 1: 30,20,40,29 +030-4,34,26,0|script|#DC1|432 +{ + end; + OnInit: + disablenpc "#DC1"; + end; +} + +// 2: 41,20,50,29 +030-4,45,26,0|script|#DC2|434 +{ + end; + OnInit: + disablenpc "#DC2"; + end; +} + +// 3: 19,31,29,40 +030-4,24,37,0|script|#DC3|434 +{ + end; + OnInit: + disablenpc "#DC3"; + end; +} + +// 4: 30,31,40,40 +030-4,34,37,0|script|#DC4|432 +{ + end; + OnInit: + disablenpc "#DC4"; + end; +} + +// 5: 41,31,50,40 +030-4,45,37,0|script|#DC5|434 +{ + end; + OnInit: + disablenpc "#DC5"; + end; +} + +// 6: 19,42,29,50 +030-4,24,48,0|script|#DC6|435 +{ + end; + OnInit: + disablenpc "#DC6"; + end; +} + +// 7: 30,42,40,50 +030-4,34,48,0|script|#DC7|433 +{ + end; + OnInit: + disablenpc "#DC7"; + end; +} + +// 8: 41,42,50,50 +030-4,45,48,0|script|#DC8|435 +{ + end; + OnInit: + disablenpc "#DC8"; + end; +} diff --git a/world/map/npc/annuals/xmas/config.txt b/world/map/npc/annuals/xmas/config.txt index 31068889..1b3b1609 100644 --- a/world/map/npc/annuals/xmas/config.txt +++ b/world/map/npc/annuals/xmas/config.txt @@ -236,7 +236,7 @@ L_Main: set $@xmas_bad_money, 500; set $@xmas_bad_exp, 200; - //Boss Fight Reward + // Boss Fight Reward (not used at the moment) set $@xmas_boss_bp, 50; // Helpers Flags needed to set $@xmas_all_helpers_bit diff --git a/world/map/npc/annuals/xmas/core.txt b/world/map/npc/annuals/xmas/core.txt index a23e01db..bbfece2d 100644 --- a/world/map/npc/annuals/xmas/core.txt +++ b/world/map/npc/annuals/xmas/core.txt @@ -142,7 +142,7 @@ function|script|XmasMainXpBpReward { callfunc "XmasSetReward"; - if(BaseLevel >= 135) + if(BaseLevel >= 140) goto L_EndGameReward; goto L_LevelingReward; diff --git a/world/map/npc/functions/dailyquest.txt b/world/map/npc/functions/dailyquest.txt index 5f2a5d85..c351fe5b 100644 --- a/world/map/npc/functions/dailyquest.txt +++ b/world/map/npc/functions/dailyquest.txt @@ -133,7 +133,7 @@ L_Exit_Good: L_Not_Enough: if (!@dq_handle_return) - mes "\"I said " + @dq_count + " " + @dq_friendly_name$ + "; you should learn to count.\""; + mes "\"I said " + @dq_count + " " + @dq_friendly_name$ + ", you should learn to count.\""; set @dq_return, 3; goto L_Exit; -- cgit v1.2.3-70-g09d2