diff options
| author | HoraK-FDF <horak-fdf@web.de> | 2025-01-08 16:04:08 +0000 |
|---|---|---|
| committer | Led Mitz <smoothshifter@tuta.io> | 2025-01-08 16:04:08 +0000 |
| commit | 9448d4ac90c13b717e7e5a246cdbc77b826042fe (patch) | |
| tree | 483f15d76c41c654f83f4a7706f32ef794f78773 | |
| parent | fd9d9489de68ce56789446c7741265d8ffe672fc (diff) | |
| download | serverdata-9448d4ac90c13b717e7e5a246cdbc77b826042fe.tar.gz serverdata-9448d4ac90c13b717e7e5a246cdbc77b826042fe.tar.bz2 serverdata-9448d4ac90c13b717e7e5a246cdbc77b826042fe.tar.xz serverdata-9448d4ac90c13b717e7e5a246cdbc77b826042fe.zip | |
Better Weight Checks for Cindy, Illia and xmas quests
- for Illia if you go overweight to a certain point you can exclude bow and helm from the drops and get 1/3 chance on the heart this works on common rewards too to exclude some drops.
- for cindy this prevents drops to ground
- iten check was way to much on xmas core so i made it heaviest reward * 3 instead
- removed weight check of santa helper since presents weight more than any of the rewards
- added a comment to snowman
Co-authored-by: Led Mitz <smoothshifter@tuta.io>
| -rw-r--r-- | world/map/npc/019-1/santa_helper.txt | 2 | ||||
| -rw-r--r-- | world/map/npc/019-1/snowman.txt | 2 | ||||
| -rw-r--r-- | world/map/npc/031-4/cindyCave.txt | 2 | ||||
| -rw-r--r-- | world/map/npc/052-2/chest.txt | 4 | ||||
| -rw-r--r-- | world/map/npc/annuals/xmas/core.txt | 4 |
5 files changed, 6 insertions, 8 deletions
diff --git a/world/map/npc/019-1/santa_helper.txt b/world/map/npc/019-1/santa_helper.txt index 9d8a21b9..56fbb02d 100644 --- a/world/map/npc/019-1/santa_helper.txt +++ b/world/map/npc/019-1/santa_helper.txt @@ -47,7 +47,7 @@ L_Yes: goto L_NoItem; getinventorylist; set @SantasHelper_Reward$, $@SantasHelper_Annual_Reward$[ rand(getarraysize($@SantasHelper_Annual_Reward$)) ]; - if ((@inventorylist_count > 99) || (checkweight(@SantasHelper_Reward$, 1) == 0)) + if (@inventorylist_count > 99) // Needs no weight check since all the presents weigh more than any of the rewards goto L_TooMany; mes "[Santa's Helper]"; mes "\"Great! Here is something for you\""; diff --git a/world/map/npc/019-1/snowman.txt b/world/map/npc/019-1/snowman.txt index 98b749df..ef26f3dd 100644 --- a/world/map/npc/019-1/snowman.txt +++ b/world/map/npc/019-1/snowman.txt @@ -43,7 +43,7 @@ L_Sure: if(countitem("CactusPotion") < @cactus_amount) goto L_NoItem; getinventorylist; - if (@inventorylist_count > 99) + if (@inventorylist_count > 99) // Needs no weight check since all the ingredients weigh more than the reward goto L_TooMany; delitem "Candy", @candy_amount; delitem "ChocolateBar", @chocolate_amount; diff --git a/world/map/npc/031-4/cindyCave.txt b/world/map/npc/031-4/cindyCave.txt index fc9fab08..4ce5d596 100644 --- a/world/map/npc/031-4/cindyCave.txt +++ b/world/map/npc/031-4/cindyCave.txt @@ -74,7 +74,7 @@ L_Reward: mes "\"I've found this thing in the cave - it looks valuable. I want you to have it.\""; next; getinventorylist; - if (@inventorylist_count == 100) + if ((checkweight("WoodenStaff", 1) == 0) || (@inventorylist_count == 100)) // check for the heaviest of them all here to avoid drops to ground. WoodenStaff = 800g goto L_Full_Inv; set @reward, rand(15); diff --git a/world/map/npc/052-2/chest.txt b/world/map/npc/052-2/chest.txt index 00645c76..06d8b972 100644 --- a/world/map/npc/052-2/chest.txt +++ b/world/map/npc/052-2/chest.txt @@ -62,7 +62,7 @@ L_GetCommonReward: getinventorylist; set @index, rand(getarraysize($@illia_common_rewards$)); set @reward$, $@illia_common_rewards$[@index]; - if ((checkweight(@reward$, 1) == 0) || (@inventorylist_count == 100)) + if ((checkweight("WarlordPlate", 1) == 0) || (@inventorylist_count == 100)) // check for the heaviest of them all here to avoid limiting chances. WarlordPlate = 2.6kg goto L_InventoryNoSpace; set @illia_current_num_rewards, @illia_current_num_rewards + 1; getitem @reward$, 1; @@ -78,7 +78,7 @@ L_GetUniqueReward: getinventorylist; set @index, rand(getarraysize($@illia_unique_rewards$)); set @reward$, $@illia_unique_rewards$[@index]; - if ((checkweight(@reward$, 1) == 0) || (@inventorylist_count == 100)) + if ((checkweight("BullHelmet", 1) == 0) || (@inventorylist_count == 100)) // check for the heaviest of them all here to avoid limiting chances. BullHelmet = 1.3kg goto L_InventoryNoSpace; next; mes "You notice an interesting shape hidden under a cover..."; diff --git a/world/map/npc/annuals/xmas/core.txt b/world/map/npc/annuals/xmas/core.txt index bbfece2d..dc3a383b 100644 --- a/world/map/npc/annuals/xmas/core.txt +++ b/world/map/npc/annuals/xmas/core.txt @@ -194,7 +194,7 @@ L_FinalGift: mes "O look, a present from " + $@xmas_present_from$[@xmas_reward_side]; next; getinventorylist; - if (@inventorylist_count > 97) + if ((checkweight("AmberChristmasSweater", 3) == 0) || (@inventorylist_count > 97)) // check for one of the heaviest*3 here to avoid drops to ground. AmberChristmasSweater/FunkyChristmasSweater/DarkChristmasSweater = 35g goto L_FullInv; set @xmas_reward, (@xmas_reward + ((BaseLevel + 10)/10)); if (debug > 0) @@ -206,8 +206,6 @@ L_FinalGift: if(@xmas_reward >= $@xmas_reward_tally_common) set @xmas_reward_item1$, $@xmas_uncommon_reward$[@xmas_uncommon_slot1]; set @xmas_reward_item2$, $@xmas_uncommon_reward$[@xmas_uncommon_slot2]; - if(checkweight("Iten", 1) == 0) - goto L_FullInv; if(@xmas_reward >= $@xmas_reward_tally_rare) getitem @xmas_reward_item$, 1; if(@xmas_reward >= $@xmas_reward_tally_common) |