Scatter Shot can not bypass stun immunity

Vor Armoury will not kill its own wyrms


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

game/modules/tome/class/Game.lua

@@ -199,7 +199,6 @@ function _M:newGame()
 			self:registerDialog(require("engine.dialogs.ShowText").new("Welcome to ToME", "intro-"..self.player.starting_intro, {name=self.player.name}, nil, nil, function()
 				self.player:resetToFull()
 				self.player:registerCharacterPlayed()
-				self.player:grantQuest(self.player.starting_quest)
 				self.player:onBirth(birth)
 				-- For quickbirth
 				self.party.name = self.player.name
@@ -208,6 +207,8 @@ function _M:newGame()
 				self.party.__version = nil
 				self.creating_player = false
 
+				self.player:grantQuest(self.player.starting_quest)
+
 				birth_done()
 				self.player:check("on_birth_done")
 			end, true))
@@ -245,7 +246,6 @@ function _M:newGame()
 			for act, _ in pairs(self.party.members) do if self.player ~= act then self.to_re_add_actors[act] = true end end
 
 			self:changeLevel(self.player.starting_level or 1, self.player.starting_zone, nil, self.player.starting_level_force_down)
-			self.player:removeQuest(self.player.starting_quest)
 			self.player:grantQuest(self.player.starting_quest)
 			self.creating_player = false
 

game/modules/tome/data/autolevel_schemes.lua

@@ -30,6 +30,10 @@ Autolevel:registerScheme{ name = "ghoul", levelup = function(self)
 	self:learnStats{ self.STAT_STR, self.STAT_CON }
 end}
 
+Autolevel:registerScheme{ name = "zerker", levelup = function(self)
+	self:learnStats{ self.STAT_STR, self.STAT_STR, self.STAT_CON }
+end}
+
 Autolevel:registerScheme{ name = "tank", levelup = function(self)
 	self:learnStats{ self.STAT_STR, self.STAT_CON, self.STAT_CON }
 end}

game/modules/tome/data/birth/races/dwarf.lua

@@ -39,8 +39,8 @@ newBirthDescriptor{
 		faction = "iron-throne",
 		type = "humanoid", subtype="dwarf",
 		default_wilderness = {28, 13},
-		starting_zone = "trollmire",
-		starting_quest = "start-allied",
+		starting_zone = "reknor-escape",
+		starting_quest = "start-dwarf",
 		starting_intro = "dwarf",
 		resolvers.inscription("INFUSION:_REGENERATION", {cooldown=10, dur=5, heal=60}),
 		resolvers.inscription("INFUSION:_WILD", {cooldown=12, what={poison=true}, dur=4, power=14}),

game/modules/tome/data/gfx/particles/gloom.lua

@@ -42,26 +42,9 @@ return { generator = function()
 		g = 0,  gv = 0, ga = 0,
 		b = 64,  bv = 0, ba = 0,
 		a = rng.range(20, 50) / 255,  av = 0, aa = 0,
-
---		trail = 1,
---		life = 30,
---		size = 12, sizev = -0.3, sizea = 0,
-
---		x = r * math.cos(a), xv = 0, xa = 0,
---		y = r * math.sin(a), yv = 0, ya = 0,
---		dir = dir, dirv = 0.1, dira = 0,
---		vel = dirchance and 0.32 or -0.2, velv = 0, vela = dirchance and -0.01 or 0.01,
-
---		r = 0,  rv = 0, ra = 0,
---		g = 0,  gv = 0, ga = 0,
---		b = 0,  bv = 0, ba = 0,
---		a = 60 / 255,  av = -.1, aa = 0,
 	}
 end, },
 function(self)
---	toggle = not toggle
---	if toggle then
-		self.ps:emit(1)
---	end
+	self.ps:emit(1)
 end,
 20

game/modules/tome/data/maps/zones/vor-armoury-last.lua

@@ -25,7 +25,7 @@ defineTile("~", "DEEP_WATER")
 defineTile("#", "HARDWALL")
 defineTile("$", "FLOOR", {random_filter={add_levels=5, ego_chance=30}})
 defineTile("%", "LAVA_FLOOR")
-defineTile("*", "LAVA_FLOOR", {random_filter={add_levels=20}}, {random_filter={name="greater multi-hued wyrm", add_levels=50}})
+defineTile("*", "FLOOR", {random_filter={add_levels=20}}, {random_filter={name="greater multi-hued wyrm", add_levels=50}})
 defineTile("=", "LAVA_FLOOR", {random_filter={unique=true, not_properties={"lore"}}}, {random_filter={name="greater multi-hued wyrm", add_levels=50}})
 --defineTile("^", "LAVA_FLOOR", "ZEMEKKYS_HAT", {random_filter={name="greater multi-hued wyrm", add_levels=50}})
 defineTile("^", "LAVA_FLOOR", nil, {random_filter={name="greater multi-hued wyrm", add_levels=50}})

game/modules/tome/data/talents/techniques/archery.lua

@@ -290,7 +290,7 @@ newTalent{
 	requires_target = true,
 	on_pre_use = function(self, t, silent) if not self:hasArcheryWeapon() then if not silent then game.logPlayer(self, "You require a bow or sling for this talent.") end return false end return true end,
 	archery_onhit = function(self, t, target, x, y)
-		if target:checkHit(self:combatAttackDex(), target:combatPhysicalResist(), 0, 95, 10) then
+		if target:checkHit(self:combatAttackDex(), target:combatPhysicalResist(), 0, 95, 10) and target:canBe("stun") then
 			target:setEffect(target.EFF_STUNNED, 2 + self:getTalentLevelRaw(t), {})
 		else
 			game.logSeen(target, "%s resists!", target.name:capitalize())