From beb2fd513fae8a26abf2f0e85b9d61dd6c4ec050 Mon Sep 17 00:00:00 2001
From: dg <dg@51575b47-30f0-44d4-a5cc-537603b46e54>
Date: Tue, 10 May 2011 00:08:39 +0000
Subject: [PATCH] octopus
git-svn-id: http://svn.net-core.org/repos/t-engine4@3328 51575b47-30f0-44d4-a5cc-537603b46e54
---
game/modules/tome/class/GameState.lua | 16 +++++++++++++++-
.../tome/data/general/objects/egos/weapon.lua | 1 -
.../tome/data/talents/spells/stone-alchemy.lua | 2 +-
3 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/game/modules/tome/class/GameState.lua b/game/modules/tome/class/GameState.lua
index 1e6283390c..fa7613824f 100644
--- a/game/modules/tome/class/GameState.lua
+++ b/game/modules/tome/class/GameState.lua
@@ -1050,7 +1050,7 @@ local random_zone_layouts = {
["'"] = data:getDoor(),
} end },
-- Building
- { name="building", rarity=1, gen=function(data)
+ { name="building", rarity=4, gen=function(data)
return {
class = "engine.generator.map.Building",
lite_room_chance = rng.range(0, 100),
@@ -1062,6 +1062,20 @@ local random_zone_layouts = {
down = data:getDown(),
door = data:getDoor(),
} end },
+ -- "Octopus"
+ { name="octopus", rarity=6, gen=function(data)
+ return {
+ class = "engine.generator.map.Octopus",
+ main_radius = {0.3, 0.4},
+ arms_radius = {0.1, 0.2},
+ arms_range = {0.7, 0.8},
+ nb_rooms = {5, 9},
+ ['.'] = data:getFloor(),
+ ['#'] = data:getWall(),
+ up = data:getUp(),
+ down = data:getDown(),
+ door = data:getDoor(),
+ } end },
}
local random_zone_themes = {
diff --git a/game/modules/tome/data/general/objects/egos/weapon.lua b/game/modules/tome/data/general/objects/egos/weapon.lua
index 15b08171dd..912d5bb47e 100644
--- a/game/modules/tome/data/general/objects/egos/weapon.lua
+++ b/game/modules/tome/data/general/objects/egos/weapon.lua
@@ -139,7 +139,6 @@ newEntity{
if eff == "stun" then target:setEffect(target.EFF_STUNNED, 3, {})
elseif eff == "blind" then target:setEffect(target.EFF_BLINDED, 3, {})
elseif eff == "pin" then target:setEffect(target.EFF_PINNED, 3, {})
- elseif eff == "stone" then target:setEffect(target.EFF_STONED, 3, {})
elseif eff == "confusion" then target:setEffect(target.EFF_CONFUSED, 3, {power=60})
elseif eff == "silence" then target:setEffect(target.EFF_SILENCED, 3, {})
elseif eff == "knockback" then target:knockback(who.x, who.y, 3)
diff --git a/game/modules/tome/data/talents/spells/stone-alchemy.lua b/game/modules/tome/data/talents/spells/stone-alchemy.lua
index 0d8c74e5b9..d8e5c6728e 100644
--- a/game/modules/tome/data/talents/spells/stone-alchemy.lua
+++ b/game/modules/tome/data/talents/spells/stone-alchemy.lua
@@ -181,7 +181,7 @@ newTalent{
local target = game.level.map(tx, ty, Map.ACTOR)
if not target then return end
- if target:checkHit(self:combatSpellpower(), target:combatSpellResist(), 0, 95, 10) and target:canBe("stone") and target:canBe("instakill") then
+ if target:checkHit(self:combatSpellpower(), target:combatSpellResist(), 0, 95, 10) and target:canBe("stun") and target:canBe("instakill") then
target:setEffect(target.EFF_STONED, t.getDuration(self, t), {})
game.level.map:particleEmitter(tx, ty, 1, "archery")
end
--
GitLab