Skip to content

Commit

Permalink
ups
Browse files Browse the repository at this point in the history
  • Loading branch information
@sayterdarkwynd
sayterdarkwynd committed Jan 27, 2017
1 parent fad0191 commit 4b2561f
Show file tree
Hide file tree
Showing 3 changed files with 55 additions and 94 deletions.
19 changes: 5 additions & 14 deletions items/active/weapons/bow/abilities/bowshot.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,7 @@ end
-- FU Crit Damage Script

function BowShot:setCritDamage(damage)
-- check their equipped weapon
-- Primary hand, or single-hand equip
local heldItem = world.entityHandItem(activeItem.ownerEntityId(), activeItem.hand())
--used for checking dual-wield setups
local opposedhandHeldItem = world.entityHandItem(activeItem.ownerEntityId(), activeItem.hand() == "primary" and "alt" or "primary")
local weaponModifier = config.getParameter("critChance",0)

Expand All @@ -36,21 +33,14 @@ function BowShot:setCritDamage(damage)
self.critChance = 9 + weaponModifier
end
end
--sb.logInfo("crit chance base="..self.critChance)
if not self.critChance then
self.critChance = 0
end

--critBonus is bonus damage done with crits

if not self.critChance then self.critChance = 0 end
self.critBonus = ( ( ( (status.stat("critBonus") + config.getParameter("critBonus",0)) * self.critChance ) /100 ) /2 ) or 0
-- this next modifier only applies if they have a multiply item equipped
self.critChance = (self.critChance + config.getParameter("critChanceMultiplier",0)+ status.stat("critChanceMultiplier",0)+ status.stat("critChance",0))
-- random dice roll. I've heavily lowered the chances, as it was far too high by nature of the random roll.
self.critRoll = math.random(200)

--apply the crit
local crit = self.critRoll <= self.critChance
--sb.logInfo("crit roll="..self.critRoll)
damage = crit and (damage*2) + self.critBonus or damage

if crit then
Expand Down Expand Up @@ -79,6 +69,7 @@ function BowShot:update(dt, fireMode, shiftHeld)
end

function BowShot:uninit()
status.clearPersistentEffects("weaponbonusdmgbow")
self:reset()
end

Expand Down Expand Up @@ -130,12 +121,12 @@ function BowShot:fire()
status.modifyResource("food", (status.resource("food") * -0.02) )
end
end
if species == "floran" then -- lamia get increased crit chance with high energy
if species == "lamia" then -- lamia get increased crit chance with high energy
local randValueCritBonus = math.random(16)
local critValueLamia = ( randValueCritBonus + math.ceil(self.energyValue/10) )
if self.energyValue >= (status.stat("maxEnergy")*0.5) then -- with high Energy reserve, lamia get increased Bow crit chance
status.modifyResource("energy", (status.resource("energy") * -0.01) ) -- consume energy
activeItem.setInstanceValue("critChanceMultiplier",critValueLamia)
status.setPersistentEffects("weaponbonusdmgbow", {{stat = "critChance", amount = critValueLamia}})
end
end

Expand Down
128 changes: 49 additions & 79 deletions items/active/weapons/ranged/gunfire.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,28 +5,34 @@ require "/scripts/interp.lua"
GunFire = WeaponAbility:new()

function GunFire:init()
self.weapon:setStance(self.stances.idle)
-- **** FR ADDITIONS
daytime = daytimeCheck()
underground = undergroundCheck()
lightLevel = getLight()

self.species = world.entitySpecies(activeItem.ownerEntityId())
local heldItem = world.entityHandItem(activeItem.ownerEntityId(), activeItem.hand())
--used for checking dual-wield setups
local opposedhandHeldItem = world.entityHandItem(activeItem.ownerEntityId(), activeItem.hand() == "primary" and "alt" or "primary")
local weaponModifier = config.getParameter("critChance",0)

-- bonus add for novakids with pistols when sped up, specifically to energy and damage equations at end of file so that they still damage and consume energy at high speed
self.energyMax = 1
-- ** END FR ADDITIONS

self.weapon:setStance(self.stances.idle)
self.cooldownTimer = self.fireTime

self.weapon.onLeaveAbility = function()
self.weapon:setStance(self.stances.idle)
end
self.species = world.entitySpecies(activeItem.ownerEntityId())
local heldItem = world.entityHandItem(activeItem.ownerEntityId(), activeItem.hand())
--used for checking dual-wield setups
local opposedhandHeldItem = world.entityHandItem(activeItem.ownerEntityId(), activeItem.hand() == "primary" and "alt" or "primary")
local weaponModifier = config.getParameter("critChance",0)

end


-- ****************************************
-- FR FUNCTIONS


-- *******************************************************
-- FU Crit Damage Script

function GunFire:setCritDamage(damage)
-- check their equipped weapon
-- Primary hand, or single-hand equip
Expand Down Expand Up @@ -72,7 +78,7 @@ function GunFire:setCritDamage(damage)

--apply the crit
local crit = self.critRoll <= self.critChance
--sb.logInfo("crit roll="..self.critRoll)
--sb.logInfo("crit roll="..self.critRoll)
damage = crit and (damage*2) + self.critBonus or damage

if crit then
Expand All @@ -86,9 +92,6 @@ function GunFire:setCritDamage(damage)

return damage
end
-- *******************************************************



function daytimeCheck()
return world.timeOfDay() < 0.5 -- true if daytime
Expand All @@ -106,66 +109,22 @@ function getLight()
lightLevel = math.floor(lightLevel * 100)
return lightLevel
end

-- set Novakid fire speed increase
function energyMaxCheck()
local position = mcontroller.position()
position[1] = math.floor(position[1])
position[2] = math.floor(position[2])
local lightLevel = world.lightLevel(position)
lightLevel = math.floor(lightLevel * 100)
return (lightLevel/100)
end

-- ***********************************************************************************************************

function GunFire:update(dt, fireMode, shiftHeld)
WeaponAbility.update(self, dt, fireMode, shiftHeld)

self.cooldownTimer = math.max(0, self.cooldownTimer - self.dt)

-- ***********************************************************************************************************
-- FR SPECIALS (Weapon speed and other such things)
-- ***********************************************************************************************************

daytime = daytimeCheck()
underground = undergroundCheck()
lightLevel = getLight()

local heldItem = world.entityHandItem(activeItem.ownerEntityId(), "primary")
local heldItem2 = world.entityHandItem(activeItem.ownerEntityId(), "alt")
local opposedhandHeldItem = world.entityHandItem(activeItem.ownerEntityId(), activeItem.hand() == "primary" and "alt" or "primary")

if self.species == "novakid" and daytime then
energyMax = energyMaxCheck()
end

if self.species == "novakid" and ( lightLevel > 50 ) then -- novakid fire pistols faster when in bright sunlight
if heldItem then
if root.itemHasTag(heldItem, "pistol") then
if daytime and not underground then -- must be in sunlight and above ground
self.fireTime = self.fireTime * energyMax
--sb.logInfo("max = "..energyMax)
--sb.logInfo("modded = "..self.fireTime)
end
end
end
end

-- ***********************************************************************************************************
-- END FR SPECIALS
-- ***********************************************************************************************************

function GunFire:update(dt, fireMode, shiftHeld)
WeaponAbility.update(self, dt, fireMode, shiftHeld)
self.cooldownTimer = math.max(0, self.cooldownTimer - self.dt )
self.cooldownTimer = self.cooldownTimer * self.energyMax -- FR
if animator.animationState("firing") ~= "fire" then
animator.setLightActive("muzzleFlash", false)
end

if self.fireMode == (self.activatingFireMode or self.abilitySlot)
and not self.weapon.currentAbility
and self.cooldownTimer == 0
and not status.resourceLocked("energy")
and not world.lineTileCollision(mcontroller.position(), self:firePosition()) then

if self.fireType == "auto" and status.overConsumeResource("energy", self:energyPerShot()) then
self:setState(self.auto)
elseif self.fireType == "burst" then
Expand All @@ -174,18 +133,39 @@ function GunFire:update(dt, fireMode, shiftHeld)
end
end


function GunFire:auto()
-- ***********************************************************************************************************
-- FR SPECIALS (Weapon speed and other such things)
-- ***********************************************************************************************************
daytime = daytimeCheck()
underground = undergroundCheck()
lightLevel = getLight()
local heldItem = world.entityHandItem(activeItem.ownerEntityId(), activeItem.hand())
local heldItem2 = world.entityHandItem(activeItem.ownerEntityId(), "alt")
local opposedhandHeldItem = world.entityHandItem(activeItem.ownerEntityId(), activeItem.hand() == "primary" and "alt" or "primary")

-- Novakid get increased pistol fire time during the daylight hours
if self.species == "novakid" then
if heldItem and root.itemHasTag(heldItem, "pistol") and daytime then -- novakid fire pistols faster when the sun is out..even underground!
self.energyMax = lightLevel / 200
else
self.energyMax = 1
end
end

self.weapon:setStance(self.stances.fire)


self:fireProjectile()
self:muzzleFlash()

if self.stances.fire.duration then
util.wait(self.stances.fire.duration)
end

self.cooldownTimer = self.fireTime

self.cooldownTimer = self.fireTime * self.energyMax -- ** FR adds to this with energyMax

self:setState(self.cooldown)
end

Expand All @@ -203,8 +183,8 @@ function GunFire:burst()

util.wait(self.burstTime)
end

self.cooldownTimer = (self.fireTime - self.burstTime) * self.burstCount
self.cooldownTimer = ((self.fireTime - self.burstTime) * self.burstCount ) * self.energyMax -- ** FR adds to this with energyMax
end

function GunFire:cooldown()
Expand Down Expand Up @@ -261,6 +241,7 @@ function GunFire:fireProjectile(projectileType, projectileParams, inaccuracy, fi
params
)
end

return projectileId
end

Expand All @@ -275,22 +256,11 @@ function GunFire:aimVector(inaccuracy)
end

function GunFire:energyPerShot()
return self.energyUsage * self.fireTime * (self.energyUsageMultiplier or 1.0)
return self.energyUsage * self.fireTime * (self.energyUsageMultiplier or 1.0)
end

function GunFire:damagePerShot()
-- *** FR SPECIAL STATS
local heldItem = world.entityHandItem(activeItem.ownerEntityId(), activeItem.hand())
if self.species == "novakid" and daytime then
if heldItem then
if root.itemHasTag(heldItem, "pistol") then energyMax = energyMaxCheck()
return GunFire:setCritDamage(self.baseDamage or (self.baseDps * self.fireTime) * (self.baseDamageMultiplier or 1.0) * config.getParameter("damageLevelMultiplier") / self.projectileCount) + 1
end
end
-- *** END FR SPECIAL STATS
else
return GunFire:setCritDamage(self.baseDamage or (self.baseDps * self.fireTime) * (self.baseDamageMultiplier or 1.0) * config.getParameter("damageLevelMultiplier") / self.projectileCount)
end
return GunFire:setCritDamage(self.baseDamage or (self.baseDps * self.fireTime) * (self.baseDamageMultiplier or 1.0) * config.getParameter("damageLevelMultiplier") / self.projectileCount)
end


Expand Down
2 changes: 1 addition & 1 deletion species/novakid.species.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
^green;25% Knockback Resistance, +5% Speed^reset;
^green;Regenerate health when well fed during the day. Regen slowly at night but consume extra food.^reset;
^green;Pistols: (single) +9% damage, (dual):+20% Knockback Resist, +8% Speed, +5% Jump, +10% Energy^reset;
^green;When in sunlight above ground your pistols gain increased firing speed^reset;
^green;During the day your pistols gain increased firing speed in brighter light^reset;
^green;Glow in the dark^reset;
^green;+15-25% Crit Chance, d10 Crit Damage bonus with Sniper Rifles^reset;
^green;+20% Damage and +10% Speed with Whips^reset;
Expand Down

0 comments on commit 4b2561f

Please sign in to comment.