Skip to content
Snippets Groups Projects
Commit 092c0819 authored by DarkGod's avatar DarkGod
Browse files

added ignore_material_restriction to all classes

parent 18374db9
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 55 additions and 43 deletions
game/modules/tome/data/birth/classes/adventurer.lua
+ 1
− 1
View file @ 092c0819
......@@ -86,7 +86,7 @@ newBirthDescriptor{
unused_talents_types = 7,
},
copy = {
resolvers.inventory{ id=true, transmo=true,
resolvers.inventorybirth{ id=true, transmo=true,
{type="weapon", subtype="dagger", name="iron dagger", autoreq=true, ego_chance=-1000},
{type="weapon", subtype="dagger", name="iron dagger", autoreq=true, ego_chance=-1000},
{type="weapon", subtype="longsword", name="iron longsword", ego_chance=-1000, ego_chance=-1000},
......
game/modules/tome/data/birth/classes/afflicted.lua
+ 2
− 2
View file @ 092c0819
......@@ -89,7 +89,7 @@ newBirthDescriptor{
},
copy = {
max_life = 110,
resolvers.equip{ id=true,
resolvers.equipbirth{ id=true,
{type="weapon", subtype="battleaxe", name="iron battleaxe", autoreq=true, ego_chance=-1000},
{type="armor", subtype="heavy", name="iron mail armour", autoreq=true, ego_chance=-1000, ego_chance=-1000}
},
......@@ -141,7 +141,7 @@ newBirthDescriptor{
},
copy = {
max_life = 90,
resolvers.equip{ id=true,
resolvers.equipbirth{ id=true,
{type="weapon", subtype="mindstar", name="mossy mindstar", autoreq=true, ego_chance=-1000},
{type="weapon", subtype="mindstar", name="mossy mindstar", autoreq=true, ego_chance=-1000},
{type="armor", subtype="cloth", name="linen robe", autoreq=true, ego_chance=-1000},
......
game/modules/tome/data/birth/classes/celestial.lua
+ 9
− 9
View file @ 092c0819
......@@ -91,13 +91,13 @@ newBirthDescriptor{
},
copy = {
max_life = 110,
resolvers.equip{ id=true,
{type="weapon", subtype="mace", name="iron mace", ignore_material_restriction=true, autoreq=true, ego_chance=-1000},
{type="armor", subtype="shield", name="iron shield", ignore_material_restriction=true, autoreq=true, ego_chance=-1000},
{type="armor", subtype="heavy", name="iron mail armour", ignore_material_restriction=true, autoreq=true, ego_chance=-1000},
resolvers.equipbirth{ id=true,
{type="weapon", subtype="mace", name="iron mace", autoreq=true, ego_chance=-1000},
{type="armor", subtype="shield", name="iron shield", autoreq=true, ego_chance=-1000},
{type="armor", subtype="heavy", name="iron mail armour", autoreq=true, ego_chance=-1000},
},
resolvers.inventory{ id=true,
{type="weapon", subtype="greatsword", name="iron greatsword", ignore_material_restriction=true, autoreq=true, ego_chance= -1000},
resolvers.inventorybirth{ id=true,
{type="weapon", subtype="greatsword", name="iron greatsword", autoreq=true, ego_chance= -1000},
},
},
......@@ -145,9 +145,9 @@ newBirthDescriptor{
},
copy = {
max_life = 90,
resolvers.equip{ id=true,
{type="weapon", subtype="staff", name="elm staff", ignore_material_restriction=true, autoreq=true, ego_chance=-1000},
{type="armor", subtype="cloth", name="linen robe", ignore_material_restriction=true, autoreq=true, ego_chance=-1000}
resolvers.equipbirth{ id=true,
{type="weapon", subtype="staff", name="elm staff", autoreq=true, ego_chance=-1000},
{type="armor", subtype="cloth", name="linen robe", autoreq=true, ego_chance=-1000}
},
},
}
game/modules/tome/data/birth/classes/chronomancer.lua
+ 4
− 4
View file @ 092c0819
......@@ -90,7 +90,7 @@ newBirthDescriptor{
},
copy = {
max_life = 90,
resolvers.equip{ id=true,
resolvers.equipbirth{ id=true,
{type="weapon", subtype="staff", name="elm staff", autoreq=true, ego_chance=-1000},
{type="armor", subtype="cloth", name="linen robe", autoreq=true, ego_chance=-1000},
},
......@@ -143,15 +143,15 @@ newBirthDescriptor{
},
copy = {
max_life = 100,
resolvers.equip{ id=true,
resolvers.equipbirth{ id=true,
{type="weapon", subtype="longsword", name="iron longsword", autoreq=true, ego_chance=-1000},
{type="weapon", subtype="dagger", name="iron dagger", autoreq=true, ego_chance=-1000},
{type="armor", subtype="light", name="rough leather armour", autoreq=true, ego_chance=-1000},
},
resolvers.inventory{ id=true, inven="QS_MAINHAND",
resolvers.inventorybirth{ id=true, inven="QS_MAINHAND",
{type="weapon", subtype="longbow", name="elm longbow", autoreq=true, ego_chance=-1000},
},
resolvers.inventory{ id=true, inven="QS_QUIVER",
resolvers.inventorybirth{ id=true, inven="QS_QUIVER",
{type="ammo", subtype="arrow", name="quiver of elm arrows", autoreq=true, ego_chance=-1000},
},
resolvers.generic(function(e)
......
game/modules/tome/data/birth/classes/corrupted.lua
+ 2
− 2
View file @ 092c0819
......@@ -81,7 +81,7 @@ newBirthDescriptor{
[ActorTalents.T_REND] = 1,
},
copy = {
resolvers.equip{ id=true,
resolvers.equipbirth{ id=true,
{type="weapon", subtype="waraxe", name="iron waraxe", autoreq=true, ego_chance=-1000},
{type="weapon", subtype="waraxe", name="iron waraxe", autoreq=true, ego_chance=-1000},
{type="armor", subtype="light", name="rough leather armour", autoreq=true, ego_chance=-1000}
......@@ -134,7 +134,7 @@ newBirthDescriptor{
[ActorTalents.T_PACIFICATION_HEX] = 1,
},
copy = {
resolvers.equip{ id=true,
resolvers.equipbirth{ id=true,
{type="weapon", subtype="staff", name="elm staff", autoreq=true, ego_chance=-1000},
{type="armor", subtype="cloth", name="linen robe", autoreq=true, ego_chance=-1000}
},
......
game/modules/tome/data/birth/classes/mage.lua
+ 3
− 3
View file @ 092c0819
......@@ -87,7 +87,7 @@ newBirthDescriptor{
},
copy = {
max_life = 90,
resolvers.equip{ id=true,
resolvers.equipbirth{ id=true,
{type="weapon", subtype="staff", name="elm staff", autoreq=true, ego_chance=-1000},
{type="armor", subtype="cloth", name="linen robe", autoreq=true, ego_chance=-1000}
},
......@@ -212,7 +212,7 @@ newBirthDescriptor{
end,
max_life = 90,
resolvers.equip{ id=true,
resolvers.equipbirth{ id=true,
{type="weapon", subtype="staff", name="elm staff", autoreq=true, ego_chance=-1000},
{type="armor", subtype="cloth", name="linen robe", autoreq=true, ego_chance=-1000},
},
......@@ -278,7 +278,7 @@ newBirthDescriptor{
copy = {
soul = 1,
max_life = 90,
resolvers.equip{ id=true,
resolvers.equipbirth{ id=true,
{type="weapon", subtype="staff", name="elm staff", autoreq=true, ego_chance=-1000},
-- {type="weapon", subtype="dagger", name="iron dagger", autoreq=true, ego_chance=-1000},
{type="armor", subtype="cloth", name="linen robe", autoreq=true, ego_chance=-1000},
......
game/modules/tome/data/birth/classes/psionic.lua
+ 3
− 3
View file @ 092c0819
......@@ -101,7 +101,7 @@ newBirthDescriptor{
},
copy = {
max_life = 110,
resolvers.equip{ id=true,
resolvers.equipbirth{ id=true,
{type="armor", subtype="cloth", name="linen robe", autoreq=true, ego_chance=-1000},
{type="weapon", subtype="greatsword", name="iron greatsword", autoreq=true, ego_chance=-1000},
},
......@@ -146,7 +146,7 @@ newBirthDescriptor{
},
copy = {
max_life = 90,
resolvers.equip{ id=true,
resolvers.equipbirth{ id=true,
{type="armor", subtype="cloth", name="linen robe", autoreq=true, ego_chance=-1000},
{type="weapon", subtype="mindstar", name="mossy mindstar", autoreq=true, ego_chance=-1000},
{type="weapon", subtype="mindstar", name="mossy mindstar", autoreq=true, ego_chance=-1000},
......@@ -212,7 +212,7 @@ newBirthDescriptor{
},
copy = {
max_life = 90,
resolvers.equip{ id=true,
resolvers.equipbirth{ id=true,
{type="armor", subtype="cloth", name="linen robe", autoreq=true, ego_chance=-1000},
{type="weapon", subtype="mindstar", name="mossy mindstar", autoreq=true, ego_chance=-1000},
{type="weapon", subtype="mindstar", name="mossy mindstar", autoreq=true, ego_chance=-1000},
......
game/modules/tome/data/birth/classes/rogue.lua
+ 6
− 6
View file @ 092c0819
......@@ -81,15 +81,15 @@ newBirthDescriptor{
[ActorTalents.T_WEAPON_COMBAT] = 1,
},
copy = {
equipment = resolvers.equip{ id=true,
equipment = resolvers.equipbirth{ id=true,
{type="weapon", subtype="dagger", name="iron dagger", autoreq=true, ego_chance=-1000},
{type="weapon", subtype="dagger", name="iron dagger", autoreq=true, ego_chance=-1000},
{type="armor", subtype="light", name="rough leather armour", autoreq=true, ego_chance=-1000}
},
resolvers.inventory{ id=true, inven="QS_MAINHAND",
resolvers.inventorybirth{ id=true, inven="QS_MAINHAND",
{type="weapon", subtype="sling", name="rough leather sling", autoreq=true, ego_chance=-1000},
},
resolvers.inventory{ id=true, inven="QS_QUIVER",
resolvers.inventorybirth{ id=true, inven="QS_QUIVER",
{type="ammo", subtype="shot", name="pouch of iron shots", autoreq=true, ego_chance=-1000},
},
},
......@@ -137,7 +137,7 @@ newBirthDescriptor{
},
copy = {
resolvers.inscription("RUNE:_MANASURGE", {cooldown=25, dur=10, mana=620}),
equipment = resolvers.equip{ id=true,
equipment = resolvers.equipbirth{ id=true,
{type="weapon", subtype="dagger", name="iron dagger", autoreq=true, ego_chance=-1000},
{type="weapon", subtype="dagger", name="iron dagger", autoreq=true, ego_chance=-1000},
{type="armor", subtype="light", name="rough leather armour", autoreq=true, ego_chance=-1000}
......@@ -187,7 +187,7 @@ newBirthDescriptor{
[ActorTalents.T_ARMOUR_TRAINING] = 1,
},
copy = {
equipment = resolvers.equip{ id=true,
equipment = resolvers.equipbirth{ id=true,
{type="weapon", subtype="dagger", name="iron dagger", autoreq=true, ego_chance=-1000},
{type="weapon", subtype="dagger", name="iron dagger", autoreq=true, ego_chance=-1000},
{type="armor", subtype="light", name="rough leather armour", autoreq=true, ego_chance=-1000},
......@@ -238,7 +238,7 @@ newBirthDescriptor{
[ActorTalents.T_WEAPON_COMBAT] = 1,
},
copy = {
resolvers.equip{
resolvers.equipbirth{
id=true,
{type="armor", subtype="light", name="rough leather armour", autoreq=true,ego_chance=-1000},
{type="weapon", subtype="sling", name="rough leather sling", autoreq=true, ego_chance=-1000},
......
game/modules/tome/data/birth/classes/warrior.lua
+ 8
− 8
View file @ 092c0819
......@@ -79,7 +79,7 @@ newBirthDescriptor{
[ActorTalents.T_ARMOUR_TRAINING] = 1,
},
copy = {
resolvers.equip{ id=true,
resolvers.equipbirth{ id=true,
{type="weapon", subtype="greatsword", name="iron greatsword", autoreq=true, ego_chance=-1000, ego_chance=-1000},
{type="armor", subtype="heavy", name="iron mail armour", autoreq=true, ego_chance=-1000, ego_chance=-1000},
},
......@@ -127,7 +127,7 @@ newBirthDescriptor{
[ActorTalents.T_WEAPONS_MASTERY] = 1,
},
copy = {
resolvers.equip{ id=true,
resolvers.equipbirth{ id=true,
{type="weapon", subtype="longsword", name="iron longsword", autoreq=true, ego_chance=-1000, ego_chance=-1000},
{type="armor", subtype="shield", name="iron shield", autoreq=true, ego_chance=-1000, ego_chance=-1000},
{type="armor", subtype="heavy", name="iron mail armour", autoreq=true, ego_chance=-1000, ego_chance=-1000}
......@@ -179,15 +179,15 @@ newBirthDescriptor{
},
copy = {
max_life = 110,
resolvers.equip{ id=true,
resolvers.equipbirth{ id=true,
{type="weapon", subtype="longbow", name="elm longbow", autoreq=true, ego_chance=-1000},
{type="ammo", subtype="arrow", name="quiver of elm arrows", autoreq=true, ego_chance=-1000},
{type="armor", subtype="light", name="rough leather armour", autoreq=true, ego_chance=-1000},
},
resolvers.inventory{ id=true, inven="QS_MAINHAND",
resolvers.inventorybirth{ id=true, inven="QS_MAINHAND",
{type="weapon", subtype="sling", name="rough leather sling", autoreq=true, ego_chance=-1000},
},
resolvers.inventory{ id=true, inven="QS_QUIVER",
resolvers.inventorybirth{ id=true, inven="QS_QUIVER",
{type="ammo", subtype="shot", name="pouch of iron shots", autoreq=true, ego_chance=-1000},
},
resolvers.generic(function(e)
......@@ -255,7 +255,7 @@ newBirthDescriptor{
copy = {
max_life = 100,
-- talent_cd_reduction={[ActorTalents.T_FLAME]=-3, [ActorTalents.T_LIGHTNING]=-3, [ActorTalents.T_EARTHEN_MISSILES]=-3, },
resolvers.equip{ id=true,
resolvers.equipbirth{ id=true,
{type="weapon", subtype="greatsword", name="iron greatsword", autoreq=true, ego_chance=-1000, ego_chance=-1000},
{type="armor", subtype="light", name="rough leather armour", autoreq=true, ego_chance=-1000, ego_chance=-1000},
},
......@@ -309,11 +309,11 @@ newBirthDescriptor{
[ActorTalents.T_UNARMED_MASTERY] = 1, -- early game is absolutely stupid without this
},
copy = {
resolvers.equip{ id=true,
resolvers.equipbirth{ id=true,
{type="armor", subtype="hands", name="iron gauntlets", autoreq=true, ego_chance=-1000, ego_chance=-1000},
{type="armor", subtype="light", name="rough leather armour", autoreq=true, ego_chance=-1000, ego_chance=-1000},
},
resolvers.inventory{ id=true,
resolvers.inventorybirth{ id=true,
{type="armor", subtype="hands", name="rough leather gloves", ego_chance=-1000, ego_chance=-1000},
},
},
......
game/modules/tome/data/birth/classes/wilder.lua
+ 3
− 3
View file @ 092c0819
......@@ -93,7 +93,7 @@ newBirthDescriptor{
},
copy = {
max_life = 90,
resolvers.equip{ id=true,
resolvers.equipbirth{ id=true,
{type="weapon", subtype="mindstar", name="mossy mindstar", autoreq=true, ego_chance=-1000},
{type="weapon", subtype="mindstar", name="mossy mindstar", autoreq=true, ego_chance=-1000},
{type="armor", subtype="light", name="rough leather armour", autoreq=true, ego_chance=-1000},
......@@ -151,7 +151,7 @@ newBirthDescriptor{
copy = {
drake_touched = 2,
max_life = 110,
resolvers.equip{ id=true,
resolvers.equipbirth{ id=true,
{type="weapon", subtype="battleaxe", name="iron battleaxe", autoreq=true, ego_chance=-1000},
{type="armor", subtype="light", name="rough leather armour", autoreq=true, ego_chance=-1000}
},
......@@ -219,7 +219,7 @@ newBirthDescriptor{
copy = {
forbid_arcane = 2,
max_life = 90,
resolvers.equip{ id=true,
resolvers.equipbirth{ id=true,
{type="weapon", subtype="mindstar", name="mossy mindstar", autoreq=true, ego_chance=-1000},
{type="weapon", subtype="mindstar", name="mossy mindstar", autoreq=true, ego_chance=-1000},
{type="armor", subtype="cloth", name="linen robe", autoreq=true, ego_chance=-1000},
......
game/modules/tome/data/zones/trollmire/zone.lua
+ 2
− 2
View file @ 092c0819
......@@ -39,8 +39,8 @@ return {
-- color_shown = {0.8, 1, 0.6, 1},
-- color_obscure = {0.8*0.6, 1*0.6, 0.6*0.6, 0.6},
ambient_music = "Rainy Day.ogg",
min_material_level = function() return game.state:isAdvanced() and 3 or 1 end,
max_material_level = function() return game.state:isAdvanced() and 4 or 2 end,
min_material_level = function() return game.state:isAdvanced() and 3 or 3 end,
max_material_level = function() return game.state:isAdvanced() and 4 or 4 end,
is_flooded = true,
nicer_tiler_overlay = "DungeonWallsGrass",
generator = {
......
game/modules/tome/resolvers.lua
+ 12
− 0
View file @ 092c0819
......@@ -23,6 +23,12 @@ local Talents = require "engine.interface.ActorTalents"
function resolvers.equip(t)
return {__resolver="equip", __resolve_last=true, t}
end
function resolvers.equipbirth(t)
for i, filter in ipairs(t) do
filter.ignore_material_restriction = true
end
return {__resolver="equip", __resolve_last=true, t}
end
--- Actually resolve the equipment creation
function resolvers.calc.equip(t, e)
-- print("Equipment resolver for", e.name)
......@@ -86,6 +92,12 @@ end
function resolvers.inventory(t)
return {__resolver="inventory", __resolve_last=true, t}
end
function resolvers.inventorybirth(t)
for i, filter in ipairs(t) do
filter.ignore_material_restriction = true
end
return {__resolver="inventory", __resolve_last=true, t}
end
--- Actually resolve the inventory creation
function resolvers.calc.inventory(t, e)
-- Iterate of object requests, try to create them and equip them
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment