diff --git a/game/modules/tome/data/birth/classes/archer.lua b/game/modules/tome/data/birth/classes/archer.lua
deleted file mode 100644
index cd41d93b5667889381899343c73caaa09603b6bd..0000000000000000000000000000000000000000
--- a/game/modules/tome/data/birth/classes/archer.lua
+++ /dev/null
@@ -1,119 +0,0 @@
--- ToME - Tales of Maj'Eyal
--- Copyright (C) 2009, 2010, 2011 Nicolas Casalini
---
--- This program is free software: you can redistribute it and/or modify
--- it under the terms of the GNU General Public License as published by
--- the Free Software Foundation, either version 3 of the License, or
--- (at your option) any later version.
---
--- This program is distributed in the hope that it will be useful,
--- but WITHOUT ANY WARRANTY; without even the implied warranty of
--- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
--- GNU General Public License for more details.
---
--- You should have received a copy of the GNU General Public License
--- along with this program. If not, see <http://www.gnu.org/licenses/>.
---
--- Nicolas Casalini "DarkGod"
--- darkgod@te4.org
-
-newBirthDescriptor{
- type = "class",
- name = "Archer",
- desc = {
- "Archers are dexterous ranged fighters, able to pin their foes to the ground and rain down a carpet of arrows on them.",
- },
- descriptor_choices =
- {
- subclass =
- {
- __ALL__ = "disallow",
- Archer = "allow",
- Slinger = "allow",
- },
- },
- copy = {
- max_life = 110,
- },
-}
-
-newBirthDescriptor{
- type = "subclass",
- name = "Archer",
- desc = {
- "Archers are dexterous ranged fighters, able to pin their foes to the ground and rain down a carpet of arrows on them.",
- "Skilled archers can fire special shots that pierce, cripple or pin their foes.",
- "Their most important stats are: Dexterity and Strength",
- "#GOLD#Stat modifiers:",
- "#LIGHT_BLUE# * +3 Strength, +5 Dexterity, +1 Constitution",
- "#LIGHT_BLUE# * +0 Magic, +0 Willpower, +0 Cunning",
- },
- stats = { dex=5, str=3, con=1, },
- talents_types = {
- ["technique/archery-training"]={true, 0.3},
- ["technique/archery-utility"]={true, 0.3},
- ["technique/archery-bow"]={true, 0.3},
- ["technique/archery-sling"]={false, 0.1},
- ["technique/combat-techniques-active"]={false, -0.1},
- ["technique/combat-techniques-passive"]={true, -0.1},
- ["technique/combat-training"]={true, 0.3},
- ["technique/field-control"]={true, 0},
- ["cunning/survival"]={true, 0},
- ["cunning/dirty"]={false, 0},
- },
- talents = {
- [ActorTalents.T_SHOOT] = 1,
- [ActorTalents.T_FLARE] = 1,
- [ActorTalents.T_STEADY_SHOT] = 1,
- [ActorTalents.T_BOW_MASTERY] = 1,
- [ActorTalents.T_WEAPON_COMBAT] = 1,
- },
- copy = {
- resolvers.equip{ id=true,
- {type="weapon", subtype="longbow", name="elm longbow", autoreq=true, ego_chance=-1000},
- {type="armor", subtype="light", name="rough leather armour", autoreq=true, ego_chance=-1000}
- },
- resolvers.generic(function(e)
- e.auto_shoot_talent = e.T_SHOOT
- end),
- },
-}
-
-newBirthDescriptor{
- type = "subclass",
- name = "Slinger",
- desc = {
- "Slingers are cunning ranged fighters, able to pin their targets to the ground and incapacitate their foes in various ways.",
- "Skilled slingers can fire special shots that knock back, blind or pin their foes.",
- "Their most important stats are: Dexterity and Cunning",
- "#GOLD#Stat modifiers:",
- "#LIGHT_BLUE# * +0 Strength, +5 Dexterity, +1 Constitution",
- "#LIGHT_BLUE# * +0 Magic, +0 Willpower, +3 Cunning",
- },
- stats = { dex=5, cun=3, con=1, },
- talents_types = {
- ["technique/archery-training"]={true, 0.3},
- ["technique/archery-utility"]={true, 0.3},
- ["technique/archery-bow"]={false, 0.1},
- ["technique/archery-sling"]={true, 0.3},
- ["technique/combat-techniques-active"]={false, -0.1},
- ["technique/combat-techniques-passive"]={true, -0.1},
- ["technique/combat-training"]={true, 0.3},
- ["technique/field-control"]={true, 0},
- ["cunning/survival"]={true, 0},
- ["cunning/dirty"]={false, 0},
- },
- talents = {
- [ActorTalents.T_SHOOT] = 1,
- [ActorTalents.T_FLARE] = 1,
- [ActorTalents.T_STEADY_SHOT] = 1,
- [ActorTalents.T_SLING_MASTERY] = 1,
- [ActorTalents.T_WEAPON_COMBAT] = 1,
- },
- copy = {
- equipment = resolvers.equip{ id=true,
- {type="weapon", subtype="sling", name="rough leather sling", autoreq=true, ego_chance=-1000},
- {type="armor", subtype="light", name="rough leather armour", autoreq=true, ego_chance=-1000}
- },
- },
-}
diff --git a/game/modules/tome/data/birth/classes/warrior.lua b/game/modules/tome/data/birth/classes/warrior.lua
index 29c8a9d909cdcbb0df3911089f9a2db2aa4548d4..98539178beb01782e0f4b490da0510f34534237f 100644
--- a/game/modules/tome/data/birth/classes/warrior.lua
+++ b/game/modules/tome/data/birth/classes/warrior.lua
@@ -30,6 +30,7 @@ newBirthDescriptor{
__ALL__ = "disallow",
Fighter = "allow",
Berserker = "allow",
+ Archer= "allow",
Brawler = "allow",
["Arcane Blade"] = "allow",
},
@@ -128,6 +129,54 @@ newBirthDescriptor{
},
}
+newBirthDescriptor{
+ type = "subclass",
+ name = "Archer",
+ desc = {
+ "Archers are dexterous ranged fighters, able to pin their foes to the ground and rain down a carpet of arrows on them.",
+ "Skilled archers can fire special shots that pierce, cripple or pin their foes.",
+ "Archers can become good with either longbows or slings.",
+ "Their most important stats are: Dexterity and Strength (when using bows) or Cunning (when using Slings)",
+ "#GOLD#Stat modifiers:",
+ "#LIGHT_BLUE# * +2 Strength, +5 Dexterity, +0 Constitution",
+ "#LIGHT_BLUE# * +0 Magic, +0 Willpower, +2 Cunning",
+ },
+ stats = { dex=5, str=2, cun=2, },
+ talents_types = {
+ ["technique/archery-training"]={true, 0.3},
+ ["technique/archery-utility"]={true, 0.3},
+ ["technique/archery-bow"]={true, 0.3},
+ ["technique/archery-sling"]={true, 0.3},
+ ["technique/combat-techniques-active"]={false, -0.1},
+ ["technique/combat-techniques-passive"]={true, -0.1},
+ ["technique/combat-training"]={true, 0.3},
+ ["technique/field-control"]={true, 0},
+ ["cunning/survival"]={true, 0},
+ ["cunning/dirty"]={false, 0},
+ },
+ talents = {
+ [ActorTalents.T_SHOOT] = 1,
+ [ActorTalents.T_FLARE] = 1,
+ [ActorTalents.T_STEADY_SHOT] = 1,
+ [ActorTalents.T_BOW_MASTERY] = 1,
+ [ActorTalents.T_SLING_MASTERY] = 1,
+ [ActorTalents.T_WEAPON_COMBAT] = 1,
+ },
+ copy = {
+ max_life = 110,
+ resolvers.equip{ id=true,
+ {type="weapon", subtype="longbow", name="elm longbow", 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",
+ {type="weapon", subtype="sling", name="rough leather sling", autoreq=true, ego_chance=-1000},
+ },
+ resolvers.generic(function(e)
+ e.auto_shoot_talent = e.T_SHOOT
+ end),
+ },
+}
+
newBirthDescriptor{
type = "subclass",
name = "Arcane Blade",
diff --git a/game/modules/tome/data/birth/descriptors.lua b/game/modules/tome/data/birth/descriptors.lua
index 6fa43056fe4aeda52c710f18e3da743a7ffe2bab..0f819b378852d6669f73c033accc66b380cff51a 100644
--- a/game/modules/tome/data/birth/descriptors.lua
+++ b/game/modules/tome/data/birth/descriptors.lua
@@ -260,7 +260,6 @@ load("/data/birth/sexes.lua")
-- Classes
load("/data/birth/classes/tutorial.lua")
load("/data/birth/classes/warrior.lua")
-load("/data/birth/classes/archer.lua")
load("/data/birth/classes/rogue.lua")
load("/data/birth/classes/mage.lua")
load("/data/birth/classes/wilder.lua")