From e6d621e1302f26dee68119560a280ed3e2696afc Mon Sep 17 00:00:00 2001
From: dg <dg@51575b47-30f0-44d4-a5cc-537603b46e54>
Date: Mon, 7 Mar 2011 11:22:17 +0000
Subject: [PATCH] fix
git-svn-id: http://svn.net-core.org/repos/t-engine4@2955 51575b47-30f0-44d4-a5cc-537603b46e54
---
game/modules/tome/class/GameState.lua | 52 +++++++++++++++++++
.../tome/data/general/stores/basic.lua | 24 ++++-----
2 files changed, 64 insertions(+), 12 deletions(-)
diff --git a/game/modules/tome/class/GameState.lua b/game/modules/tome/class/GameState.lua
index 6872b10c70..5413f6efdc 100644
--- a/game/modules/tome/class/GameState.lua
+++ b/game/modules/tome/class/GameState.lua
@@ -648,6 +648,58 @@ local drop_tables = {
money = 8,
},
},
+ store = {
+ [1] = {
+ uniques = 3,
+ double_greater = 10,
+ greater_normal = 15,
+ greater = 25,
+ double_ego = 45,
+ ego = 0,
+ basic = 0,
+ money = 4,
+ },
+ [2] = {
+ uniques = 4,
+ double_greater = 20,
+ greater_normal = 18,
+ greater = 25,
+ double_ego = 35,
+ ego = 0,
+ basic = 0,
+ money = 4,
+ },
+ [3] = {
+ uniques = 5,
+ double_greater = 30,
+ greater_normal = 22,
+ greater = 25,
+ double_ego = 25,
+ ego = 0,
+ basic = 0,
+ money = 4,
+ },
+ [4] = {
+ uniques = 6,
+ double_greater = 40,
+ greater_normal = 30,
+ greater = 25,
+ double_ego = 20,
+ ego = 0,
+ basic = 0,
+ money = 4,
+ },
+ [5] = {
+ uniques = 7,
+ double_greater = 50,
+ greater_normal = 30,
+ greater = 25,
+ double_ego = 10,
+ ego = 0,
+ basic = 0,
+ money = 4,
+ },
+ },
boss = {
[1] = {
uniques = 3,
diff --git a/game/modules/tome/data/general/stores/basic.lua b/game/modules/tome/data/general/stores/basic.lua
index 5a42b0b71e..f89088aacb 100644
--- a/game/modules/tome/data/general/stores/basic.lua
+++ b/game/modules/tome/data/general/stores/basic.lua
@@ -28,7 +28,7 @@ newEntity{
min_fill = 10,
max_fill = 20,
filters = function()
- return {type="armor", id=true, ego_chance={ego_chance=100, properties=rng.percent(game.player.level) and {"greater_ego"}}}
+ return {type="armor", id=true, tome_drops="store"}
end,
},
}
@@ -44,7 +44,7 @@ newEntity{
min_fill = 10,
max_fill = 20,
filters = function()
- return {type="weapon", id=true, ego_chance={ego_chance=100, properties=rng.percent(game.player.level) and {"greater_ego"}}}
+ return {type="weapon", id=true, tome_drops="store"}
end,
},
}
@@ -113,10 +113,10 @@ newEntity{
max_fill = 25,
filters = function()
return rng.table{
- {type="weapon", subtype="staff", id=true, ego_chance={ego_chance=100, properties=rng.percent(game.player.level) and {"greater_ego"}}},
- {type="weapon", subtype="staff", id=true, ego_chance={ego_chance=100, properties=rng.percent(game.player.level) and {"greater_ego"}}},
- {type="weapon", subtype="staff", id=true, ego_chance={ego_chance=100, properties=rng.percent(game.player.level) and {"greater_ego"}}},
- {type="wand", subtype="wand", id=true, ego_chance={ego_chance=100, properties=rng.percent(game.player.level) and {"greater_ego"}}},
+ {type="weapon", subtype="staff", id=true, tome_drops="store"},
+ {type="weapon", subtype="staff", id=true, tome_drops="store"},
+ {type="weapon", subtype="staff", id=true, tome_drops="store"},
+ {type="wand", subtype="wand", id=true, tome_drops="store"},
}
end,
},
@@ -138,9 +138,9 @@ newEntity{
filters = function()
return rng.table{
{type="jewelry", subtype="ring", id=true, ego_chance=-1000},
- {type="jewelry", id=true, ego_chance={ego_chance=100, properties=rng.percent(game.player.level) and {"greater_ego"}}},
- {type="jewelry", id=true, ego_chance={ego_chance=100, properties=rng.percent(game.player.level) and {"greater_ego"}}},
- {type="jewelry", id=true, ego_chance={ego_chance=100, properties=rng.percent(game.player.level) and {"greater_ego"}}},
+ {type="jewelry", id=true, tome_drops="store"},
+ {type="jewelry", id=true, tome_drops="store"},
+ {type="jewelry", id=true, tome_drops="store"},
}
end,
},
@@ -180,7 +180,7 @@ newEntity{
min_fill = 10,
max_fill = 20,
filters = function()
- return {id=true, ignore={type="money"}, add_levels=10, ego_chance={ego_chance=100, properties=rng.percent(game.player.level * 2) and {"greater_ego"}}}
+ return {id=true, ignore={type="money"}, add_levels=10, tome_drops="boss"}
end,
},
}
@@ -236,7 +236,7 @@ newEntity{
min_fill = 20,
max_fill = 30,
filters = function()
- return {type="armor", id=true, ego_chance={ego_chance=100, properties=rng.percent(game.player.level) and {"greater_ego"}}}
+ return {type="armor", id=true, tome_drops="store"}
end,
post_filter = function(e)
if e.power_source and e.power_source.arcane then return false end
@@ -256,7 +256,7 @@ newEntity{
min_fill = 20,
max_fill = 30,
filters = function()
- return {type="weapon", id=true, ego_chance={ego_chance=100, properties=rng.percent(game.player.level) and {"greater_ego"}}}
+ return {type="weapon", id=true, tome_drops="store"}
end,
post_filter = function(e)
if e.power_source and e.power_source.arcane then return false end
--
GitLab