From 47fbb1dfdc6426027557b5bf9af8a67868a3fbb5 Mon Sep 17 00:00:00 2001
From: dg <dg@51575b47-30f0-44d4-a5cc-537603b46e54>
Date: Mon, 7 Nov 2011 00:54:36 +0000
Subject: [PATCH] The Yeek Wayist town Irkkk is now visitable (not much to see
yet though)
git-svn-id: http://svn.net-core.org/repos/t-engine4@4616 51575b47-30f0-44d4-a5cc-537603b46e54
---
game/modules/tome/class/Game.lua | 1 -
game/modules/tome/data/maps/towns/irkkk.lua | 76 +++++++++----------
.../tome/data/zones/town-irkkk/npcs.lua | 48 +++++++-----
.../tome/data/zones/wilderness/grids.lua | 3 +-
4 files changed, 69 insertions(+), 59 deletions(-)
diff --git a/game/modules/tome/class/Game.lua b/game/modules/tome/class/Game.lua
index 38dccecc30..043ab0b08d 100644
--- a/game/modules/tome/class/Game.lua
+++ b/game/modules/tome/class/Game.lua
@@ -1114,7 +1114,6 @@ function _M:setupCommands()
[{"_g","ctrl"}] = function() if config.settings.cheat then
-- self.zone:addEntity(self.level, self.zone:makeEntityByName(self.level, "terrain", 'PORTAL'), "terrain", game.player.x,game.player.y-1)
game:changeLevel(1,"town-irkkk")
--- SET ui.Inventory into ShowStore & ShowInventory
-- FINISH IRKKK & HUTS
end end,
[{"_f","ctrl"}] = function() if config.settings.cheat then
diff --git a/game/modules/tome/data/maps/towns/irkkk.lua b/game/modules/tome/data/maps/towns/irkkk.lua
index 64d9fe2a96..014f440bb5 100644
--- a/game/modules/tome/data/maps/towns/irkkk.lua
+++ b/game/modules/tome/data/maps/towns/irkkk.lua
@@ -17,10 +17,10 @@
-- Nicolas Casalini "DarkGod"
-- darkgod@te4.org
-startx = 0
-starty = 40
-endx = 0
-endy = 40
+startx = 39
+starty = 47
+endx = 49
+endy = 47
-- defineTile section
defineTile("#", "BAMBOO_HUT_WALL")
@@ -46,27 +46,27 @@ defineTile("*", "BAMBOO_HUT_COOKING3")
-- ASCII map section
return [[
~~~~....................t..........ttttttttt......
-~~~................tt...t..................t...tt.
-~~~...............ttt....t..t....tt...........tt..
+~~~..tttt..........tt...t..................t...tt.
+~~~...tt..........ttt....t..t....tt...........tt..
~~~.....................tttttt....tttttttttt.ttt..
~~~..........ttt.........ttttttt.ttt....t...tt..t.
-~~~.........tttt.....tt...ttt......ttt..........t.
-~~~.........tttt.....tt.........t........t..t.....
-~~~..........tt......ttttt........t.......ttt..t..
-~~~..........t........tt.tt...ttttt.......t...t...
-~~~...................ttt...tt....t.tt...tt...t...
-~~~~..................t..t..t....t.......tt...t...
-~~~~..................t.t.tt.....tttt...t.t...t...
-~~~~~....................t..tt...t..t.tt..t..t.t..
-~~~~~............t........tt.ttt.t...tt...t..t.t..
-~~~~~......................t...ttt....t...t....t..
-~~~~~.............tt........#####tt.t..tt.t.t..t..
-~~~~~~............t.........#___#.tt.t.tt...t..t..
-~~~~~~..........ttt.........#___#...tt.....tt...t.
-~~~~~~..........tt..........#___#.t..tt....tt...t.
-~~~~~~..........t...........##+##t...t.tt..tt.t.t.
+~~~.........tttt.###.tt...ttt......ttt..........t.
+~~~.........tttt.#_#.tt.........t........t..t.....
+~~~..........tt..#_#.ttttt........t.......ttt..t..
+~~~.t........t...#_#..tt.tt...ttttt.......t...t...
+~~~.t...###......###..ttt...tt....t.tt...tt...t...
+~~~~.t..#_#...........t..t..t....t.......tt...t...
+~~~~..t.###...........t.t.tt.....tttt...t.t...t...
+t~~~~.t..................t..tt...t..t.tt..t..t.t..
+~~~~~.....ttt....t........tt.ttt.t...tt...t..t.t..
+~~~~~.....t.............t.............t...t....t..
+~~~~~.............tt........#####.t.t..tt.t.t..t..
+~~~~~~....t.......t....t....#___#.tt.t.tt...t..t..
+~~~~~~....t.....ttt.........#___#...tt.....tt...t.
+~tt~~~....t.t...tt..........#___#.t..tt....tt...t.
+~tt~~~......t...t...........##+##....t.tt..tt.t.t.
~~~~~~............tt..................t.....t.t.t.
-~~~~~.................................t...t.t.t.tt
+~~~~~....tt...........................t...t.t.t.tt
~~~~~......................____.......t..ttt.t..tt
~~~~~.....................______.......ttt.t.t..t.
~~~~~.....###..#####.....________.....tt.ttttt.tt.
@@ -74,24 +74,24 @@ return [[
~~~~~~....#_####_____+...___**___.......tt..ttt...
~~~~~~....#________###...________.......tt...ttt..
~~~~~~....#___######......______.............tttt.
-~~~~~~~...#_###............____..............t.tt.
+~t~~~~~...#_###............____..............t.tt.
~~~~~~~...###..............................t.t..t.
~~~~~~~..................................tt.tt..t.
~~~~~~~.....................#+##..........t.ttt...
-~~~~~~......................#__#..........t.ttt..t
-~~~~~~......................#__#..........t.t.tt.t
-~~~~~~...................####__####...........tt..
-~~~~~~...................#________#..........t.t.t
-~~~~~~...................#________#........t.t.t.t
+~~~~~~......t...............#__#..........t.ttt..t
+~~~~~~....tt................#__#..........t.t.tt.t
+~~t~~~....t...t..........####__####...........tt..
+~~~~~~....t...t..........#________#..........t.t.t
+~~~~~~.......t...........#________#........t.t.t.t
~~~~~~...................####__####........t...t.t
~~~~~~......................#__#............t..ttt
-~~~~~.......................#__#...............tt.
-~~~~~.......................####.............t.tt.
-~~~~~~.......................................t..tt
-~~~~~~~.....................................tt..t.
-~~~~~~~......................................t..t.
-~~~~~~~~....................................tt.tt.
-~~~~~~~~.....................................t....
-~~~~~~~~~........................................t
-~~~~~~~~~~..................................t....t
-~~~~~~~~~~~~~...................................t.]]
+~~~~~....#####..............#__#...............tt.
+~~~~~....#___#..............####.............t.tt.
+~~~~~~...#___#...............................t..tt
+~~~~~~~..###_#..............................tt..t.
+~~~~~~~....#_#...............................t..t.
+~~~~~~~~...###......tt........#####...............
+~t~~~~~~............t..t......#___#...............
+~~~~~~~~~..........t...t......#___#..............<
+~~~~t~~~~~.........tt.........#####..........tt..t
+~~~~~~~~~~~~~...........t................t..t...t.]]
diff --git a/game/modules/tome/data/zones/town-irkkk/npcs.lua b/game/modules/tome/data/zones/town-irkkk/npcs.lua
index f6e892ce91..ddd3678585 100644
--- a/game/modules/tome/data/zones/town-irkkk/npcs.lua
+++ b/game/modules/tome/data/zones/town-irkkk/npcs.lua
@@ -22,15 +22,15 @@ load("/data/general/npcs/gwelgoroth.lua", function(e) if e.rarity then e.derth_r
local Talents = require("engine.interface.ActorTalents")
newEntity{
- define_as = "BASE_NPC_ELVALA_TOWN",
- type = "humanoid", subtype = "shalore",
+ define_as = "BASE_NPC_IRKKK_TOWN",
+ type = "humanoid", subtype = "yeek",
display = "p", color=colors.WHITE,
- faction = "shalore",
+ faction = "the-way",
anger_emote = "Catch @himher@!",
combat = { dam=resolvers.rngavg(1,2), atk=2, apr=0, dammod={str=0.4} },
- body = { INVEN = 10, MAINHAND=1, OFFHAND=1, BODY=1, QUIVER=1 },
+ body = { INVEN = 10, MAINHAND=1, OFFHAND=1, BODY=1, QUIVER=1, PSIONIC_FOCUS=1 },
lite = 3,
life_rating = 10,
@@ -40,36 +40,48 @@ newEntity{
open_door = true,
resolvers.racial(),
- resolvers.inscriptions(1, "rune"),
+ resolvers.inscriptions(1, "infusion"),
- autolevel = "warrior",
+ autolevel = "wildcaster",
ai = "dumb_talented_simple", ai_state = { ai_move="move_dmap", talent_in=3, },
- stats = { str=12, dex=8, mag=6, con=10 },
+ stats = { str=7, dex=8, mag=6, wil=15, con=10 },
emote_random = resolvers.emote_random{allow_backup_guardian=true},
}
-newEntity{ base = "BASE_NPC_ELVALA_TOWN",
- name = "elvala guard", color=colors.LIGHT_UMBER,
- desc = [[A stern-looking guard, he will not let you disturb the town.]],
+newEntity{ base = "BASE_NPC_IRKKK_TOWN",
+ name = "yeek mindslayer", color=colors.LIGHT_UMBER,
+ desc = [[A mindslayer in training.]],
level_range = {1, nil}, exp_worth = 1,
rarity = 3,
max_life = resolvers.rngavg(70,80),
resolvers.equip{
- {type="weapon", subtype="longsword", autoreq=true},
- {type="armor", subtype="shield", autoreq=true},
+ {type="weapon", subtype="greatsword", autoreq=true},
},
combat_armor = 2, combat_def = 0,
- resolvers.talents{ [Talents.T_RUSH]=1, [Talents.T_PERFECT_STRIKE]=1, },
+ resolvers.talents{
+ [Talents.T_KINETIC_AURA]={base=1, every=7, max=5},
+ [Talents.T_CHARGED_AURA]={base=1, every=7, max=5},
+ [Talents.T_KINETIC_SHIELD]={base=2, every=7, max=5},
+ [Talents.T_EXOTIC_WEAPONS_MASTERY]={base=1, every=7, max=10},
+ },
}
-newEntity{ base = "BASE_NPC_ELVALA_TOWN",
- name = "shalore rune master", color=colors.RED,
- desc = [[A tall elf, his skin covered in runes.]],
+newEntity{ base = "BASE_NPC_IRKKK_TOWN",
+ name = "yeek psionic", color=colors.YELLOW,
+ desc = [[You can literaly feel the mental energies emited by this yeek.]],
level_range = {1, nil}, exp_worth = 1,
rarity = 3,
max_life = resolvers.rngavg(50,60),
ai_state = { talent_in=1, },
- autolevel = "caster",
- resolvers.inscriptions(3, {"heat beam rune", "frozen spear rune", "acid wave rune", "lightning rune"}),
+ resolvers.inventory{ inven="PSIONIC_FOCUS",
+ {type="gem"},
+ },
+ resolvers.talents{
+ [Talents.T_MINDLASH]={base=1, every=7, max=5},
+ [Talents.T_PYROKINESIS]={base=1, every=7, max=5},
+ [Talents.T_REACH]={base=3, every=7, max=5},
+ [Talents.T_CHARGED_AURA]={base=1, every=7, max=5},
+ [Talents.T_KINETIC_SHIELD]={base=2, every=7, max=5},
+ },
}
diff --git a/game/modules/tome/data/zones/wilderness/grids.lua b/game/modules/tome/data/zones/wilderness/grids.lua
index 0b272be3d3..5c82486a59 100644
--- a/game/modules/tome/data/zones/wilderness/grids.lua
+++ b/game/modules/tome/data/zones/wilderness/grids.lua
@@ -299,8 +299,7 @@ newEntity{ base="TOWN", define_as = "TOWN_GATES_OF_MORNING",
}
newEntity{ base="TOWN", define_as = "TOWN_IRKKK",
name = "Irkkk (Town)", add_mos = {{image="terrain/village_01.png"}},
- desc = "Yeek Wayist capital",
- change_level = false,
+ desc = "Yeek Wayist main village",
change_zone="town-irkkk",
}
newEntity{ base="TOWN", define_as = "TOWN_ZIGUR",
--
GitLab