From 2fdf566ecd41ffe4328ab75b8930865ebdf965be Mon Sep 17 00:00:00 2001
From: Bunny <glisa825@gmail.com>
Date: Wed, 25 Dec 2019 01:40:05 -0500
Subject: [PATCH] Improve loot quality from pride uniques Vaults give worse
loot now and these are harder than vaults ever were, so it makes sense to
buff their drops some
---
game/modules/tome/class/GameState.lua | 6 +++++-
.../tome/data/zones/gorbat-pride/mapscripts/main.lua | 5 +++--
.../tome/data/zones/grushnak-pride/mapscripts/last.lua | 4 ++--
.../tome/data/zones/grushnak-pride/mapscripts/main.lua | 4 ++--
game/modules/tome/data/zones/vor-pride/mapscripts/main.lua | 5 +++--
5 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/game/modules/tome/class/GameState.lua b/game/modules/tome/class/GameState.lua
index 4c08a20832..f2227bbcd9 100644
--- a/game/modules/tome/class/GameState.lua
+++ b/game/modules/tome/class/GameState.lua
@@ -2263,6 +2263,7 @@ end
-- @param data.ai = ai_type <"tactical" if rank>3 or base.ai>
-- @param data.ai_tactic = tactical weights table for the tactical ai <nil - generated based on talents>
-- @param data.no_loot_randart set true to not drop a randart <nil>
+-- @param data.loot_fixedart set true to drop a fixedart <nil>
-- @param data.on_die set true to run base.rng_boss_on_die and base.rng_boss_on_die_custom on death <nil>
-- @param data.name_scheme <randart_name_rules.default>
-- @param data.post = function(b, data) to run last to finish generation
@@ -2356,6 +2357,7 @@ function _M:createRandomBoss(base, data)
-- Boss worthy drops
b[#b+1] = resolvers.drops{chance=100, nb=data.loot_quantity or 3, {tome_drops=data.loot_quality or "boss"} }
if not data.no_loot_randart then b[#b+1] = resolvers.drop_randart{} end
+ if data.loot_unique then b[#b+1] = resolvers.drops{chance=100, nb=1, {unique=true, not_properties={"lore"}} } end
-- On die
if data.on_die then
@@ -2622,6 +2624,7 @@ end
-- @field data.ai = ai_type <"tactical" if rank>3 or base.ai>
-- @field data.ai_tactic = tactical weights table for the tactical ai <nil - generated based on talents>
-- @field data.no_loot_randart set true to not drop a randart <nil>
+-- @field data.loot_fixedart set true to drop a fixedart <nil>
-- @field data.on_die set true to run base.rng_boss_on_die and base.rng_boss_on_die_custom on death <nil>
-- @field data.name_scheme <randart_name_rules.default>
-- @field data.post = function(b, data) to run last to finish generation
@@ -2710,7 +2713,8 @@ function _M:createRandomBossNew(base, data)
-- Boss worthy drops
b[#b+1] = resolvers.drops{chance=100, nb=data.loot_quantity or 3, {tome_drops=data.loot_quality or "boss"} }
if not data.no_loot_randart then b[#b+1] = resolvers.drop_randart{} end
-
+ if data.loot_unique then b[#b+1] = resolvers.drops{chance=100, nb=1, {unique=true, not_properties={"lore"}} } end
+
-- On die
if data.on_die then
b.rng_boss_on_die = b.on_die
diff --git a/game/modules/tome/data/zones/gorbat-pride/mapscripts/main.lua b/game/modules/tome/data/zones/gorbat-pride/mapscripts/main.lua
index 3677a23d59..1df0a80bbc 100644
--- a/game/modules/tome/data/zones/gorbat-pride/mapscripts/main.lua
+++ b/game/modules/tome/data/zones/gorbat-pride/mapscripts/main.lua
@@ -27,7 +27,8 @@ if level.level == zone.max_level then self:defineTile(">", 'FLOOR') else self:de
self:defineTile("O", "FLOOR", nil, {random_filter={type='humanoid', subtype='orc', special=function(e) return e.pride == mapdata.pride end, random_boss={nb_classes=1, loot_quality="store", loot_quantity=3, ai_move="move_complex", rank=4,}}})
self:defineTile("X", "FLOOR", nil, {entity_mod=function(e) e.make_escort = nil return e end, random_filter={type='humanoid', subtype='orc', special=function(e) return e.pride == mapdata.pride end, random_boss={nb_classes=1, loot_quality="store", loot_quantity=1, no_loot_randart=true, ai_move="move_complex", rank=3}}}, nil, {no_teleport=true})
self:defineTile("d", "FENCE_FLOOR", nil, {random_filter={special_rarity="drake_rarity"}}, nil, {special="roost"})
-self:defineTile("D", "FENCE_FLOOR", nil, {entity_mod=function(e) e.make_escort = nil return e end, random_filter={special_rarity="drake_rarity", special=function(e) return e.rank == 3 end, random_boss={nb_classes=1, loot_quality="store", loot_quantity=1, no_loot_randart=true, ai_move="move_complex", rank=3.5}}}, nil, {special="roost"})
+self:defineTile("D", "FENCE_FLOOR", nil, {entity_mod=function(e) e.make_escort = nil return e end, random_filter={special_rarity="drake_rarity", special=function(e) return e.rank == 3 end, random_boss={nb_classes=1, loot_quality="store", loot_quantity=1, loot_unique=true, no_loot_randart=true, ai_move="move_complex", rank=3.5}}}, nil, {special="roost"}) --drops a fixedart
+self:defineTile("R", "FENCE_FLOOR", nil, {entity_mod=function(e) e.make_escort = nil return e end, random_filter={special_rarity="drake_rarity", special=function(e) return e.rank == 3 end, random_boss={nb_classes=1, loot_quality="store", loot_quantity=1, ai_move="move_complex", rank=3.5}}}, nil, {special="roost"}) --drops a randart
self:defineTile('&', "GENERIC_LEVER_SAND", nil, nil, nil, {special="roost", lever=1, lever_kind="pride-doors", lever_spot={type="lever", subtype="door", check_connectivity="entrance"}}, {type="lever", subtype="lever", check_connectivity="entrance"})
self:defineTile('*', "ROCK_LEVER_DOOR", nil, nil, nil, {lever_action=2, lever_action_value=0, lever_action_kind="pride-doors"}, {type="lever", subtype="door", check_connectivity="entrance"})
@@ -63,7 +64,7 @@ tm:applyOnGroups(rooms, function(room, idx)
local drake = room:pickSpot("any")
if drake then
local boss = rng.percent(25) and not had_boss
- tm:put(drake, boss and 'D' or 'd')
+ tm:put(drake, boss and (rng.percent(65) and 'D' or 'R') or 'd')
room:remove(drake)
if boss then had_boss = true end
else
diff --git a/game/modules/tome/data/zones/grushnak-pride/mapscripts/last.lua b/game/modules/tome/data/zones/grushnak-pride/mapscripts/last.lua
index 343f661695..933c9a33ea 100644
--- a/game/modules/tome/data/zones/grushnak-pride/mapscripts/last.lua
+++ b/game/modules/tome/data/zones/grushnak-pride/mapscripts/last.lua
@@ -28,8 +28,8 @@ self:defineTile('"', "HARDWALL")
self:defineTile('t', "TRAINING_DUMMY")
self:defineTile('b', "FLOOR", nil, "ORC_ELITE_BERSERKER")
self:defineTile('f', "FLOOR", nil, "ORC_ELITE_FIGHTER")
-self:defineTile("B", "FLOOR", nil, {random_filter={define_as="ORC_ELITE_BERSERKER", random_boss={name_scheme="Combat Trainer #rng#", force_classes={Berserker=true}, nb_classes=1, loot_quality="store", loot_quantity=1, no_loot_randart=true, rank=3.5}}})
-self:defineTile("F", "FLOOR", nil, {random_filter={define_as="ORC_ELITE_FIGHTER", random_boss={name_scheme="Combat Trainer #rng#", force_classes={Bulwark=true}, nb_classes=1, loot_quality="store", loot_quantity=1, no_loot_randart=true, rank=3.5}}})
+self:defineTile("B", "FLOOR", nil, {random_filter={define_as="ORC_ELITE_BERSERKER", random_boss={name_scheme="Combat Trainer #rng#", force_classes={Berserker=true}, nb_classes=1, loot_quality="store", loot_quantity=1, rank=3.5}}})
+self:defineTile("F", "FLOOR", nil, {random_filter={define_as="ORC_ELITE_FIGHTER", random_boss={name_scheme="Combat Trainer #rng#", force_classes={Bulwark=true}, nb_classes=1, loot_quality="store", loot_quantity=1, loot_unique=true, no_loot_randart=true, rank=3.5}}})
self:defineTile('>', "SLIME_TUNNELS", nil, nil, nil, {special="slimepit"})
self:defineTile(";", "UNDERGROUND_CREEP", nil, nil, nil, {special="slimepit"})
self:defineTile("s", "UNDERGROUND_CREEP", nil, {random_filter={special_rarity="slime_rarity"}}, nil, {special="slimepit"})
diff --git a/game/modules/tome/data/zones/grushnak-pride/mapscripts/main.lua b/game/modules/tome/data/zones/grushnak-pride/mapscripts/main.lua
index f76c993cf0..0880faa85c 100644
--- a/game/modules/tome/data/zones/grushnak-pride/mapscripts/main.lua
+++ b/game/modules/tome/data/zones/grushnak-pride/mapscripts/main.lua
@@ -23,8 +23,8 @@ self:defineTile('"', "HARDWALL")
self:defineTile('t', "TRAINING_DUMMY")
self:defineTile('b', "FLOOR", nil, "ORC_ELITE_BERSERKER")
self:defineTile('f', "FLOOR", nil, "ORC_ELITE_FIGHTER")
-self:defineTile("B", "FLOOR", nil, {random_filter={define_as="ORC_ELITE_BERSERKER", random_boss={name_scheme="Combat Trainer #rng#", force_classes={Berserker=true}, nb_classes=1, loot_quality="store", loot_quantity=1, no_loot_randart=true, rank=3.5}}})
-self:defineTile("F", "FLOOR", nil, {random_filter={define_as="ORC_ELITE_FIGHTER", random_boss={name_scheme="Combat Trainer #rng#", force_classes={Bulwark=true}, nb_classes=1, loot_quality="store", loot_quantity=1, no_loot_randart=true, rank=3.5}}})
+self:defineTile("B", "FLOOR", nil, {random_filter={define_as="ORC_ELITE_BERSERKER", random_boss={name_scheme="Combat Trainer #rng#", force_classes={Berserker=true}, nb_classes=1, loot_quality="store", loot_quantity=1, rank=3.5}}})
+self:defineTile("F", "FLOOR", nil, {random_filter={define_as="ORC_ELITE_FIGHTER", random_boss={name_scheme="Combat Trainer #rng#", force_classes={Bulwark=true}, nb_classes=1, loot_quality="store", loot_quantity=1, loot_unique=true, no_loot_randart=true, rank=3.5}}})
-- Make the barracks
local bsp = BSP.new(5, 5, 6):make(30, 30, '.', '#')
diff --git a/game/modules/tome/data/zones/vor-pride/mapscripts/main.lua b/game/modules/tome/data/zones/vor-pride/mapscripts/main.lua
index d849627323..41d2312b16 100644
--- a/game/modules/tome/data/zones/vor-pride/mapscripts/main.lua
+++ b/game/modules/tome/data/zones/vor-pride/mapscripts/main.lua
@@ -26,7 +26,8 @@ self:defineTile('&', "GOTHIC_GENERIC_LEVER", nil, nil, nil, {lever=1, lever_kind
self:defineTile('*', "GOTHIC_GENERIC_LEVER_DOOR", nil, nil, nil, {lever_action=2, lever_action_value=0, lever_action_kind="pride-doors"}, {type="lever", subtype="door", check_connectivity="entrance"})
self:defineTile('B', {"GENERIC_BOOK1","GENERIC_BOOK2","GENERIC_BOOK3"})
-self:defineTile('C', "CANDLE", nil, {random_filter={type='humanoid', subtype='orc', special=function(e) return e.pride == mapdata.pride end, random_boss={nb_classes=0, loot_quality="store", loot_quantity=1, no_loot_randart=true, ai_move="move_complex", rank=3.5, force_classes={Archmage=true}}}})
+self:defineTile('C', "CANDLE", nil, {random_filter={type='humanoid', subtype='orc', special=function(e) return e.pride == mapdata.pride end, random_boss={nb_classes=0, loot_quality="store", loot_quantity=1, ai_move="move_complex", rank=3.5, force_classes={Archmage=true}}}})
+self:defineTile('D', "CANDLE", nil, {random_filter={type='humanoid', subtype='orc', special=function(e) return e.pride == mapdata.pride end, random_boss={nb_classes=0, loot_quality="store", loot_quantity=1, loot_unique=true, no_loot_randart=true, ai_move="move_complex", rank=3.5, force_classes={Archmage=true}}}})
local wfc = WaveFunctionCollapse.new{
mode="overlapping",
@@ -60,7 +61,7 @@ tm:applyOnGroups(rooms, function(room, idx)
local cpos = room:randomNearPoint(bpos)
if cpos then
tm:put(bpos, 'B')
- tm:put(cpos, 'C')
+ tm:put(cpos, (rng.percent(65) and 'C' or 'D'))
end
end
end
--
GitLab