From bb4e14199a842f7d13c947e557ba5aea6ba66cbb Mon Sep 17 00:00:00 2001
From: dg <dg@51575b47-30f0-44d4-a5cc-537603b46e54>
Date: Thu, 28 Oct 2010 10:31:08 +0000
Subject: [PATCH] plop
git-svn-id: http://svn.net-core.org/repos/t-engine4@1674 51575b47-30f0-44d4-a5cc-537603b46e54
---
game/modules/tome/data/birth/descriptors.lua | 2 +-
game/modules/tome/data/chats/derth-attack-over.lua | 2 +-
game/modules/tome/data/general/objects/egos/sling.lua | 2 +-
game/modules/tome/data/quests/escort-duty.lua | 2 +-
game/modules/tome/data/quests/lightning-overload.lua | 2 +-
game/modules/tome/data/talents/misc/misc.lua | 2 +-
game/modules/tome/data/timed_effects.lua | 4 ++--
game/modules/tome/data/zones/trollshaws/npcs.lua | 2 +-
8 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/game/modules/tome/data/birth/descriptors.lua b/game/modules/tome/data/birth/descriptors.lua
index b7f8cf9916..1ddd6be2a9 100644
--- a/game/modules/tome/data/birth/descriptors.lua
+++ b/game/modules/tome/data/birth/descriptors.lua
@@ -191,7 +191,7 @@ load("/data/birth/worlds.lua")
load("/data/birth/races/tutorial.lua")
load("/data/birth/races/human.lua")
load("/data/birth/races/elf.lua")
-load("/data/birth/races/hobbit.lua")
+load("/data/birth/races/halfling.lua")
load("/data/birth/races/dwarf.lua")
load("/data/birth/races/orc.lua")
load("/data/birth/races/troll.lua")
diff --git a/game/modules/tome/data/chats/derth-attack-over.lua b/game/modules/tome/data/chats/derth-attack-over.lua
index 216d5df1a9..da200b80e3 100644
--- a/game/modules/tome/data/chats/derth-attack-over.lua
+++ b/game/modules/tome/data/chats/derth-attack-over.lua
@@ -18,7 +18,7 @@
-- darkgod@te4.org
newChat{ id="welcome",
- text = [[#LIGHT_GREEN#*A hobbit comes forth from his hidding place.*#WHITE#
+ text = [[#LIGHT_GREEN#*A halfling comes forth from his hiding place.*#WHITE#
You killed them all? Are we safe now? Oh please tell me this was a bad dream!]],
answers = {
{"Be at easy, I have dispatched those monstrosities. Do you know where they came from or what they wanted?", jump="quest"},
diff --git a/game/modules/tome/data/general/objects/egos/sling.lua b/game/modules/tome/data/general/objects/egos/sling.lua
index 9c33c958c4..8ff9b7cc8f 100644
--- a/game/modules/tome/data/general/objects/egos/sling.lua
+++ b/game/modules/tome/data/general/objects/egos/sling.lua
@@ -77,7 +77,7 @@ newEntity{
}
newEntity{
- name = "hobbit ", prefix=true, instant_resolve=true,
+ name = "halfling ", prefix=true, instant_resolve=true,
level_range = {30, 50},
greater_ego = true,
rarity = 24,
diff --git a/game/modules/tome/data/quests/escort-duty.lua b/game/modules/tome/data/quests/escort-duty.lua
index 9dc245ff3d..5d58cdbcd0 100644
--- a/game/modules/tome/data/quests/escort-duty.lua
+++ b/game/modules/tome/data/quests/escort-duty.lua
@@ -100,7 +100,7 @@ local possible_types = {
text = [[Please help me! I am afraid I lost myself in this place, I know there is a recall portal left around there by a friend, but I fought too many battles, I fear I will not make it. Would you help me?]],
actor = {
name = "%s, the repented thief",
- type = "humanoid", subtype = "hobbit",
+ type = "humanoid", subtype = "halfling",
display = "@", color=colors.BLUE,
desc = [[He looks tired and wounded.]],
autolevel = "rogue",
diff --git a/game/modules/tome/data/quests/lightning-overload.lua b/game/modules/tome/data/quests/lightning-overload.lua
index 522596ebf6..533cb91be4 100644
--- a/game/modules/tome/data/quests/lightning-overload.lua
+++ b/game/modules/tome/data/quests/lightning-overload.lua
@@ -87,7 +87,7 @@ kill_one = function(self)
if self.kill_count >= self.max_count then
local Chat = require "engine.Chat"
- local chat = Chat.new("derth-attack-over", {name="Scared hobbit"}, game.player)
+ local chat = Chat.new("derth-attack-over", {name="Scared halfling"}, game.player)
chat:invoke()
end
end
diff --git a/game/modules/tome/data/talents/misc/misc.lua b/game/modules/tome/data/talents/misc/misc.lua
index d8e15d36c1..e11c59043f 100644
--- a/game/modules/tome/data/talents/misc/misc.lua
+++ b/game/modules/tome/data/talents/misc/misc.lua
@@ -215,7 +215,7 @@ newTalent{
no_energy = true,
cooldown = 50,
action = function(self, t)
- self:setEffect(self.EFF_HOBBIT_LUCK, 5, {
+ self:setEffect(self.EFF_HALFLING_LUCK, 5, {
physical=10 + self:getCun() / 2,
spell=10 + self:getCun() / 2,
})
diff --git a/game/modules/tome/data/timed_effects.lua b/game/modules/tome/data/timed_effects.lua
index ed8a228518..ff18a3423d 100644
--- a/game/modules/tome/data/timed_effects.lua
+++ b/game/modules/tome/data/timed_effects.lua
@@ -498,8 +498,8 @@ newEffect{
}
newEffect{
- name = "HOBBIT_LUCK",
- desc = "Hobbit's Luck",
+ name = "HALFLING_LUCK",
+ desc = "Halflings's Luck",
long_desc = function(self, eff) return ("The target luck and cunning combine to grant it %d%% more combat critical chances and %d%% more spell critical chances."):format(eff.physical, eff.spell) end,
type = "physical",
status = "beneficial",
diff --git a/game/modules/tome/data/zones/trollshaws/npcs.lua b/game/modules/tome/data/zones/trollshaws/npcs.lua
index 034f717132..d7a6d4dc89 100644
--- a/game/modules/tome/data/zones/trollshaws/npcs.lua
+++ b/game/modules/tome/data/zones/trollshaws/npcs.lua
@@ -35,7 +35,7 @@ newEntity{ define_as = "TROLL_BILL",
type = "giant", subtype = "troll", unique = true,
name = "Bill the Stone Troll",
display = "T", color=colors.VIOLET, image="npc/troll_bill.png",
- desc = [[Big, brawny, powerful and with a taste for hobbit. He has friends called Bert and Tom.
+ desc = [[Big, brawny, powerful and with a taste for halfling. He has friends called Bert and Tom.
He is wielding a small tree trunk and towering toward you.
He should have turned to stone long ago, how could he still walk?!]],
level_range = {7, 20}, exp_worth = 2,
--
GitLab