From 30a978ce0c22ed8e5c4daddec1c01d43838b2162 Mon Sep 17 00:00:00 2001 From: Jesusaves Date: Tue, 8 Nov 2022 14:31:58 -0300 Subject: getusers(0) causes a SEGV, but leave code ready anyway. Fix bugs. --- world/map/npc/annuals/fathertime.txt | 37 ++++++++++++++++++++++-------------- 1 file changed, 23 insertions(+), 14 deletions(-) diff --git a/world/map/npc/annuals/fathertime.txt b/world/map/npc/annuals/fathertime.txt index 8726d29b..c4720032 100644 --- a/world/map/npc/annuals/fathertime.txt +++ b/world/map/npc/annuals/fathertime.txt @@ -81,17 +81,19 @@ L_Friday: end; L_Pirate: - areamonster "001-1", 20, 20, 120, 120, "Blanc's Minion", 1121, 2, "#HolidayConfig::OnLameShield"; - areamonster "002-1", 20, 20, 120, 120, "Blanc's Minion", 1119, 2, "#HolidayConfig::OnLameShield"; - areamonster "003-4", 20, 20, 170, 120, "Blanc's Minion", 1122, 1, "#HolidayConfig::OnLameShield"; - areamonster "004-1", 20, 20, 100, 110, "Blanc's Minion", 1120, 2, "#HolidayConfig::OnLameShield"; - areamonster "007-1", 20, 20, 120, 100, "Blanc's Minion", 1120, 2, "#HolidayConfig::OnLameShield"; - areamonster "011-6", 20, 140, 180, 280, "Blanc's Minion", 1121, 2, "#HolidayConfig::OnLameShield"; - areamonster "018-1", 20, 20, 180, 100, "Blanc's Minion", 1122, 1, "#HolidayConfig::OnLameShield"; - areamonster "041-1", 20, 20, 75, 100, "Blanc's Minion", 1119, 2, "#HolidayConfig::OnLameShield"; - areamonster "042-1", 20, 20, 140, 120, "Blanc's Minion", 1120, 2, "#HolidayConfig::OnLameShield"; - areamonster "043-1", 20, 20, 100, 130, "Blanc's Minion", 1121, 2, "#HolidayConfig::OnLameShield"; - areamonster "057-1", 20, 60, 150, 100, "Blanc's Minion", 1122, 1, "#HolidayConfig::OnLameShield"; + //set $@BLANC, (getusers(0) / 5) + 1; // "Segmentation fault (core dumped)" + set $@BLANC, 2; + areamonster "001-1", 20, 20, 120, 120, "Blanc's Minion", 1121, $@BLANC, "#HolidayConfig::OnLameShield"; + areamonster "002-1", 20, 20, 120, 120, "Blanc's Minion", 1119, $@BLANC, "#HolidayConfig::OnLameShield"; + areamonster "003-4", 20, 20, 170, 120, "Blanc's Minion", 1122, 1, "#HolidayConfig::OnLameHat"; + areamonster "004-1", 20, 20, 100, 110, "Blanc's Minion", 1120, $@BLANC, "#HolidayConfig::OnLameShield"; + areamonster "007-1", 20, 20, 120, 100, "Blanc's Minion", 1120, $@BLANC, "#HolidayConfig::OnLameShield"; + areamonster "011-6", 20, 140, 180, 280, "Blanc's Minion", 1121, $@BLANC, "#HolidayConfig::OnLameShield"; + areamonster "018-1", 20, 20, 180, 100, "Blanc's Minion", 1122, 1, "#HolidayConfig::OnLameHat"; + areamonster "041-1", 20, 20, 75, 100, "Blanc's Minion", 1119, $@BLANC, "#HolidayConfig::OnLameShield"; + areamonster "042-1", 20, 20, 140, 120, "Blanc's Minion", 1120, $@BLANC, "#HolidayConfig::OnLameShield"; + areamonster "043-1", 20, 20, 100, 130, "Blanc's Minion", 1121, $@BLANC, "#HolidayConfig::OnLameShield"; + areamonster "057-1", 20, 60, 150, 100, "Blanc's Minion", 1122, 1, "#HolidayConfig::OnLameHat"; end; OnFriday: @@ -99,11 +101,18 @@ OnFriday: end; OnLameShield: - // Chance: 0.1% + // Chance: 0.1% - 0.01% // TODO: Once MLP brings the Dragon Shield, replace with HMC Hat. - if (rand(1000) > 1) + if (rand(10000) > 9) goto L_Die; - getitem DragonShield, 1; + getitem "DragonShield", 1; + end; + +OnLameHat: + // Chance: 0.1% + if (rand(1000) > 1) + goto OnLameShield; + getitem "HMCPirateHat", 1; end; L_Die: -- cgit v1.2.3-60-g2f50