Irkkk got stores!

git-svn-id: http://svn.net-core.org/repos/t-engine4@4620 51575b47-30f0-44d4-a5cc-537603b46e54

game/modules/tome/data/general/stores/basic.lua

@@ -107,6 +107,32 @@ newEntity{
 	},
 }
 
+newEntity{
+	define_as = "TWO_HANDS_WEAPON",
+	name = "two handed weapons",
+	display = '3', color=colors.UMBER,
+	store = {
+		purse = 25,
+		empty_before_restock = false,
+		filters = {
+			{special=function(o) return o.type == "weapon" and o.twohanded end, id=true, tome_drops="store"},
+		},
+	},
+}
+
+newEntity{
+	define_as = "ONE_HAND_WEAPON",
+	name = "one handed weapons",
+	display = '3', color=colors.UMBER,
+	store = {
+		purse = 25,
+		empty_before_restock = false,
+		filters = {
+			{special=function(o) return o.type == "weapon" and not o.twohanded end, id=true, tome_drops="store"},
+		},
+	},
+}
+
 newEntity{
 	define_as = "ARCHER_WEAPON",
 	name = "archery",

game/modules/tome/data/maps/towns/irkkk.lua

@@ -32,12 +32,12 @@ defineTile(".", "JUNGLE_GRASS")
 defineTile("t", "JUNGLE_TREE")
 defineTile("*", "BAMBOO_HUT_COOKING3")
 
---defineTile("1", "HARDWALL", nil, nil, "CLOTH_ARMOR_STORE")
---defineTile("2", "HARDWALL", nil, nil, "LIGHT_ARMOR_STORE")
---defineTile("3", "HARDWALL", nil, nil, "STAFF_WEAPON_STORE")
---defineTile("4", "HARDWALL", nil, nil, "SWORD_WEAPON_STORE")
---defineTile("5", "HARDWALL", nil, nil, "RUNEMASTER")
---defineTile("a", "HARDWALL", nil, nil, "ALCHEMIST")
+defineTile("1", "BAMBOO_HUT_FLOOR", nil, "YEEK_STORE_GEM")
+defineTile("2", "BAMBOO_HUT_FLOOR", nil, "YEEK_STORE_2HANDS")
+defineTile("3", "BAMBOO_HUT_FLOOR", nil, "YEEK_STORE_CLOTH")
+defineTile("4", "BAMBOO_HUT_FLOOR", nil, "YEEK_STORE_1HAND")
+defineTile("5", "BAMBOO_HUT_FLOOR", nil, "YEEK_STORE_LEATHER")
+defineTile("6", "BAMBOO_HUT_FLOOR", nil, "YEEK_STORE_NATURE")
 
 -- addSpot section
 
@@ -62,16 +62,16 @@ t~~~~.t..................t..tt...t..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.
+~~~~~~....t.....ttt.........#_4_#...tt.....tt...t.
 ~tt~~~....t.t...tt..........#___#.t..tt....tt...t.
 ~tt~~~......t...t...........##+##....t.tt..tt.t.t.
 ~~~~~~............tt..................t.....t.t.t.
 ~~~~~....tt...........................t...t.t.t.tt
 ~~~~~......................____.......t..ttt.t..tt
-~~~~~.....................______.......ttt.t.t..t.
+~~~~~.....................__1___.......ttt.t.t..t.
 ~~~~~.....###..#####.....________.....tt.ttttt.tt.
-~~~~~.....#_#..#___###...___**___......tt.tt.ttt..
-~~~~~~....#_####_____+...___**___.......tt..ttt...
+~~~~~.....#_#..#_6_###...___**___......tt.tt.ttt..
+~~~~~~....#_####_5___+...___**___.......tt..ttt...
 ~~~~~~....#________###...________.......tt...ttt..
 ~~~~~~....#___######......______.............tttt.
 ~t~~~~~...#_###............____..............t.tt.
@@ -81,7 +81,7 @@ t~~~~.t..................t..tt...t..t.tt..t..t.t..
 ~~~~~~......t...............#__#..........t.ttt..t
 ~~~~~~....tt................#__#..........t.t.tt.t
 ~~t~~~....t...t..........####__####...........tt..
-~~~~~~....t...t..........#________#..........t.t.t
+~~~~~~....t...t..........#__2__3__#..........t.t.t
 ~~~~~~.......t...........#________#........t.t.t.t
 ~~~~~~...................####__####........t...t.t
 ~~~~~~......................#__#............t..ttt

game/modules/tome/data/zones/town-irkkk/npcs.lua

@@ -85,3 +85,118 @@ newEntity{ base = "BASE_NPC_IRKKK_TOWN",
 		[Talents.T_KINETIC_SHIELD]={base=2, every=7, max=5},
 	},
 }
+
+-------------------------------- Stores
+newEntity{ base = "BASE_NPC_IRKKK_TOWN", define_as = "YEEK_STORE_GEM",
+	name = "gem crafter", color=colors.BLUE,
+	desc = [[This yeek has all sorts of gems to sell.]],
+	level_range = {1, nil}, exp_worth = 1,
+	max_life = resolvers.rngavg(50,60),
+	ai_state = { talent_in=1, },
+	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},
+	},
+	resolvers.store("GEMSTORE"),
+}
+
+newEntity{ base = "BASE_NPC_IRKKK_TOWN", define_as = "YEEK_STORE_2HANDS",
+	name = "two hander weapons crafter", color=colors.UMBER,
+	desc = [[This yeek has all sorts of two handed weapons to sell.]],
+	level_range = {1, nil}, exp_worth = 1,
+	max_life = resolvers.rngavg(50,60),
+	ai_state = { talent_in=1, },
+	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},
+	},
+	resolvers.store("TWO_HANDS_WEAPON"),
+}
+
+newEntity{ base = "BASE_NPC_IRKKK_TOWN", define_as = "YEEK_STORE_1HAND",
+	name = "one hander weapons crafter", color=colors.UMBER,
+	desc = [[This yeek has all sorts of one handed weapons to sell.]],
+	level_range = {1, nil}, exp_worth = 1,
+	max_life = resolvers.rngavg(50,60),
+	ai_state = { talent_in=1, },
+	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},
+	},
+	resolvers.store("ONE_HAND_WEAPON"),
+}
+
+newEntity{ base = "BASE_NPC_IRKKK_TOWN", define_as = "YEEK_STORE_CLOTH",
+	name = "tailor", color=colors.BLUE,
+	desc = [[This yeek has all sorts of cloth to sell.]],
+	level_range = {1, nil}, exp_worth = 1,
+	max_life = resolvers.rngavg(50,60),
+	ai_state = { talent_in=1, },
+	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},
+	},
+	resolvers.store("CLOTH_ARMOR"),
+}
+
+newEntity{ base = "BASE_NPC_IRKKK_TOWN", define_as = "YEEK_STORE_LEATHER",
+	name = "tanner", color=colors.BLUE,
+	desc = [[This yeek has all sorts of leathers to sell.]],
+	level_range = {1, nil}, exp_worth = 1,
+	max_life = resolvers.rngavg(50,60),
+	ai_state = { talent_in=1, },
+	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},
+	},
+	resolvers.store("LIGHT_ARMOR"),
+}
+
+newEntity{ base = "BASE_NPC_IRKKK_TOWN", define_as = "YEEK_STORE_NATURE",
+	name = "natural infusions", color=colors.BLUE,
+	desc = [[This yeek has all sorts of infusions to sell.]],
+	level_range = {1, nil}, exp_worth = 1,
+	max_life = resolvers.rngavg(50,60),
+	ai_state = { talent_in=1, },
+	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},
+	},
+	resolvers.store("POTION"),
+}