plop

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

game/modules/tome/data/general/objects/bows.lua

@@ -125,7 +125,7 @@ newEntity{ base = "BASE_ARROW",
 	cost = 0.05,
 	material_level = 1,
 	combat = {
-		capacity = resolvers.rngavg(6, 8),
+		capacity = resolvers.rngavg(5, 15),
 		dam = resolvers.rngavg(7,12),
 		apr = 5,
 		physcrit = 1,
@@ -140,7 +140,7 @@ newEntity{ base = "BASE_ARROW",
 	cost = 0.1,
 	material_level = 2,
 	combat = {
-		capacity = resolvers.rngavg(7, 9),
+		capacity = resolvers.rngavg(7, 15),
 		dam = resolvers.rngavg(15,22),
 		apr = 7,
 		physcrit = 1.5,
@@ -155,7 +155,7 @@ newEntity{ base = "BASE_ARROW",
 	cost = 0.15,
 	material_level = 3,
 	combat = {
-		capacity = resolvers.rngavg(8, 10),
+		capacity = resolvers.rngavg(9, 15),
 		dam = resolvers.rngavg(28,37),
 		apr = 10,
 		physcrit = 2,
@@ -185,7 +185,7 @@ newEntity{ base = "BASE_ARROW",
 	cost = 0.35,
 	material_level = 5,
 	combat = {
-		capacity = resolvers.rngavg(14, 19),
+		capacity = resolvers.rngavg(13, 15),
 		dam = resolvers.rngavg(50, 57),
 		apr = 18,
 		physcrit = 3,

game/modules/tome/data/general/objects/egos/ammo.lua

@@ -201,16 +201,17 @@ newEntity{
 	power_source = {technique=true},
 	name = " of annihilation", suffix=true, instant_resolve=true,
 	keywords = {annihilation=true},
-	level_range = {1, 50},
+	level_range = {30, 50},
 	greater_ego = 1,
 	cost = 1,
 	rarity = 15,
 	combat = {
-		dam = resolvers.mbonus_material(50, 15),
-		atk = resolvers.mbonus_material(20, 5),
+		dam = resolvers.mbonus_material(10, 2),
+		physcrit = resolvers.mbonus_material(10, 2),
+		apr  = resolvers.mbonus_material(10, 2),
 		travel_speed = 200,
 		-- Powerful but comes in a small quiver/pouch
-		capacity = resolvers.generic(function(e) return e.combat.capacity / 5 end),
+		--capacity = resolvers.generic(function(e) return e.combat.capacity / 5 end),
 	},
 }
 
@@ -245,21 +246,3 @@ newEntity{
 		},
 	},
 }
-
-
-newEntity{
-	power_source = {nature=true},
-	name = " of sunrise", suffix=true, instant_resolve=true,
-	keywords = {sunrise=true},
-	level_range = {1, 50},
-	greater_ego = 1,
-	cost = 30,
-	rarity = 15,
-	combat = {
-		tg_type = "beam",
-		travel_speed = 300,
-		-- Powerful but comes in a small quiver/pouch
-		capacity = resolvers.generic(function(e) return e.combat.capacity / 4 end),
-	},
-	resolvers.generic(function(e) e.combat.damtype = DamageType.LITE_LIGHT end),
-}

game/modules/tome/data/general/objects/slings.lua

@@ -121,7 +121,7 @@ newEntity{ base = "BASE_SHOT",
 	cost = 0.05,
 	material_level = 1,
 	combat = {
-		capacity = resolvers.rngavg(10, 20),
+		capacity = resolvers.rngavg(10, 25),
 		dam = resolvers.rngavg(7,12),
 		apr = 1,
 		physcrit = 4,
@@ -136,7 +136,7 @@ newEntity{ base = "BASE_SHOT",
 	cost = 0.10,
 	material_level = 2,
 	combat = {
-		capacity = resolvers.rngavg(12, 24),
+		capacity = resolvers.rngavg(12, 25),
 		dam = resolvers.rngavg(15,22),
 		apr = 2,
 		physcrit = 4.5,
@@ -151,7 +151,7 @@ newEntity{ base = "BASE_SHOT",
 	cost = 0.15,
 	material_level = 3,
 	combat = {
-		capacity = resolvers.rngavg(14, 28),
+		capacity = resolvers.rngavg(14, 25),
 		dam = resolvers.rngavg(28,37),
 		apr = 3,
 		physcrit = 5,
@@ -166,7 +166,7 @@ newEntity{ base = "BASE_SHOT",
 	cost = 0.25,
 	material_level = 4,
 	combat = {
-		capacity = resolvers.rngavg(16, 32),
+		capacity = resolvers.rngavg(16, 25),
 		dam = resolvers.rngavg(40,47),
 		apr = 5,
 		physcrit = 5.5,
@@ -181,7 +181,7 @@ newEntity{ base = "BASE_SHOT",
 	cost = 0.35,
 	material_level = 5,
 	combat = {
-		capacity = resolvers.rngavg(18, 36),
+		capacity = resolvers.rngavg(18, 25),
 		dam = resolvers.rngavg(50, 57),
 		apr = 6,
 		physcrit = 7,

game/modules/tome/data/general/objects/world-artifacts.lua

@@ -2381,6 +2381,30 @@ Touching the cloth you feel a sense of knowledge and power from bygone ages, yet
 	end,
 }
 
+newEntity{ base = "BASE_ARROW",
+	power_source = {arcane=true},
+	unique = true,
+	name = "Quiver of the Sun",
+	unided_name = "bright quiver",
+	desc = [[This strange orange quiver is made of brass and etched with many bright red runes that glow and glitter in the light.  The arrows themselves appear to be solid shafts of blazing hot light, like rays of sunshine, hammered and forged into a solid state.]],
+	color = colors.BLUE, --image = "object/artifact/wizard_hat_of_arcane_understanding.png",
+	level_range = {20, 40},
+	rarity = 300,
+	cost = 100,
+	material_level = 3,
+	require = { stat = { dex=24 }, },
+	combat = {
+		capacity = 6,
+		tg_type = "beam",
+		travel_speed = 300,
+		dam = 34,
+		apr = 10,
+		physcrit = 2,
+		dammod = {dex=0.7, str=0.5},
+		damtype = DamageType.LITE_LIGHT,
+	},
+}
+
 --[=[
 newEntity{
 	unique = true,

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

@@ -59,7 +59,13 @@ newTalent{
 	tactical = { AMMO = 2 },
 	on_pre_use = function(self, t, silent) if not self:hasAmmo() then if not silent then game.logPlayer(self, "You must have a quiver or pouch equipped.") end return false end return true end,
 	shots_per_turn = function(self, t)
-		return self:getTalentLevelRaw(t) + (self:attr("ammo_reload_speed") or 0)
+		local v = math.max(self:getTalentLevelRaw(self.T_BOW_MASTERY), self:getTalentLevelRaw(self.T_SLING_MASTERY))
+		local add = 0
+		if v >= 10 then add = add + 3
+		elseif v >= 6 then add = add + 2
+		elseif v >= 3 then add = add + 1
+		end
+		return self:getTalentLevelRaw(t) + (self:attr("ammo_reload_speed") or 0) + add
 	end,
 	action = function(self, t)
 		local q, err = self:hasAmmo()

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

@@ -28,7 +28,12 @@ newTalent{
 	info = function(self, t)
 		local damage = t.getDamage(self, t)
 		local inc = t.getPercentInc(self, t)
-		return ([[Increases Physical Power by %d. Also increases damage done with bows by %d%%.]]):
+		return ([[Increases Physical Power by %d. Also increases damage done with bows by %d%%.
+		Also, when using Reload:
+		At level 3 it grants one more reload per turn.
+		At level 6 it grants two more reloads per turn.
+		At level 10 it grants three more reloads per turn.
+		]]):
 		format(damage, inc * 100)
 	end,
 }

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

@@ -28,7 +28,12 @@ newTalent{
 	info = function(self, t)
 		local damage = t.getDamage(self, t)
 		local inc = t.getPercentInc(self, t)
-		return ([[Increases Physical Power by %d. Also increases damage done with slings by %d%%.]]):
+		return ([[Increases Physical Power by %d. Also increases damage done with slings by %d%%.
+		Also, when using Reload:
+		At level 3 it grants one more reload per turn.
+		At level 6 it grants two more reloads per turn.
+		At level 10 it grants three more reloads per turn.
+		]]):
 		format(damage, inc * 100)
 	end,
 }

game/modules/tome/data/zones/dreadfell/npcs.lua

@@ -51,8 +51,8 @@ newEntity{ define_as = "THE_MASTER",
 
 	body = { INVEN = 10, MAINHAND=1, OFFHAND=1, BODY=1, NECK=1, },
 	equipment = resolvers.equip{
-		{type="weapon", subtype="greatsword", force_drop=true, tome_drops="boss", autoreq=true},
-		{type="armor", subtype="heavy", force_drop=true, tome_drops="boss", autoreq=true},
+		{type="weapon", subtype="greatsword", forbid_power_source={antimagic=true}, force_drop=true, tome_drops="boss", autoreq=true},
+		{type="armor", subtype="heavy", forbid_power_source={antimagic=true}, force_drop=true, tome_drops="boss", autoreq=true},
 		{type="jewelry", subtype="amulet", defined="AMULET_DREAD", random_art_replace={chance=75}, autoreq=true},
 	},
 	resolvers.drops{chance=100, nb=5, {tome_drops="boss"} },
@@ -144,8 +144,8 @@ newEntity{ define_as = "PALE_DRAKE",
 
 	body = { INVEN = 10, MAINHAND=1, OFFHAND=1, BODY=1, NECK=1, },
 	equipment = resolvers.equip{
-		{type="weapon", subtype="staff", force_drop=true, tome_drops="boss", autoreq=true},
-		{type="armor", subtype="cloth", force_drop=true, tome_drops="boss", autoreq=true},
+		{type="weapon", subtype="staff", forbid_power_source={antimagic=true}, force_drop=true, tome_drops="boss", autoreq=true},
+		{type="armor", subtype="cloth", forbid_power_source={antimagic=true}, force_drop=true, tome_drops="boss", autoreq=true},
 	},
 	resolvers.drops{chance=100, nb=5, {tome_drops="boss"} },
 	resolvers.drops{chance=100, nb=1, {defined="RUNED_SKULL", random_art_replace={chance=75}} },

game/modules/tome/data/zones/high-peak/npcs.lua

@@ -83,9 +83,9 @@ newEntity{
 	body = { INVEN = 10, MAINHAND=1, OFFHAND=1, BODY=1, HEAD=1, FEET=1 },
 	resolvers.equip{
 		{type="weapon", subtype="staff", defined="STAFF_ABSORPTION_AWAKENED", autoreq=true},
-		{type="armor", subtype="cloth", force_drop=true, tome_drops="boss", autoreq=true},
-		{type="armor", subtype="head", force_drop=true, tome_drops="boss", autoreq=true},
-		{type="armor", subtype="feet", force_drop=true, tome_drops="boss", autoreq=true},
+		{type="armor", subtype="cloth", forbid_power_source={antimagic=true}, force_drop=true, tome_drops="boss", autoreq=true},
+		{type="armor", subtype="head", forbid_power_source={antimagic=true}, force_drop=true, tome_drops="boss", autoreq=true},
+		{type="armor", subtype="feet" forbid_power_source={antimagic=true},, force_drop=true, tome_drops="boss", autoreq=true},
 	},
 	resolvers.drops{chance=100, nb=5, {tome_drops="boss"} },
 
@@ -158,12 +158,12 @@ newEntity{
 
 	body = { INVEN = 10, MAINHAND=1, OFFHAND=1, BODY=1, FEET=1, HEAD=1, HANDS=1 },
 	resolvers.equip{
-		{type="weapon", subtype="sword", force_drop=true, tome_drops="boss", autoreq=true},
-		{type="weapon", subtype="waraxe", force_drop=true, tome_drops="boss", autoreq=true},
-		{type="armor", subtype="massive", force_drop=true, tome_drops="boss", autoreq=true},
-		{type="armor", subtype="feet", name="pair of voratun boots", force_drop=true, tome_drops="boss", autoreq=true},
-		{type="armor", subtype="head", name="voratun helm", force_drop=true, tome_drops="boss", autoreq=true},
-		{type="armor", subtype="hands", name="voratun gauntlets", force_drop=true, tome_drops="boss", autoreq=true},
+		{type="weapon", subtype="sword", force_drop=true,  forbid_power_source={antimagic=true}, tome_drops="boss", autoreq=true},
+		{type="weapon", subtype="waraxe", force_drop=true, forbid_power_source={antimagic=true}, tome_drops="boss", autoreq=true},
+		{type="armor", subtype="massive", force_drop=true, forbid_power_source={antimagic=true}, tome_drops="boss", autoreq=true},
+		{type="armor", subtype="feet", name="pair of voratun boots", force_drop=true, forbid_power_source={antimagic=true}, tome_drops="boss", autoreq=true},
+		{type="armor", subtype="head", name="voratun helm", forbid_power_source={antimagic=true}, force_drop=true, tome_drops="boss", autoreq=true},
+		{type="armor", subtype="hands", name="voratun gauntlets", forbid_power_source={antimagic=true}, force_drop=true, tome_drops="boss", autoreq=true},
 	},
 	resolvers.drops{chance=100, nb=1, {defined="PEARL_LIFE_DEATH"} },
 	resolvers.drops{chance=100, nb=5, {tome_drops="boss"} },
@@ -237,11 +237,11 @@ newEntity{ define_as = "FALLEN_SUN_PALADIN_AERYN",
 	resolvers.drops{chance=100, nb=3, {tome_drops="boss"} },
 
 	resolvers.equip{
-		{type="weapon", subtype="mace", force_drop=true, tome_drops="boss", autoreq=true},
-		{type="armor", subtype="shield", force_drop=true, tome_drops="boss", autoreq=true},
-		{type="armor", subtype="massive", force_drop=true, tome_drops="boss", autoreq=true},
-		{type="armor", subtype="feet", force_drop=true, tome_drops="boss", autoreq=true},
-		{type="armor", subtype="head", force_drop=true, tome_drops="boss", autoreq=true},
+		{type="weapon", subtype="mace", force_drop=true, forbid_power_source={antimagic=true}, tome_drops="boss", autoreq=true},
+		{type="armor", subtype="shield", force_drop=true, forbid_power_source={antimagic=true}, tome_drops="boss", autoreq=true},
+		{type="armor", subtype="massive", force_drop=true, forbid_power_source={antimagic=true}, tome_drops="boss", autoreq=true},
+		{type="armor", subtype="feet", force_drop=true, forbid_power_source={antimagic=true}, tome_drops="boss", autoreq=true},
+		{type="armor", subtype="head", force_drop=true, forbid_power_source={antimagic=true}, tome_drops="boss", autoreq=true},
 	},
 
 	die = function(self, src)