Merge pull request #67 from DexterHaslem/master

changed jetpack fuel to pct in script
This commit is contained in:
Dexter Haslem 2018-01-27 14:08:30 -07:00 committed by GitHub
commit d8b6542648
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -373,7 +373,7 @@ basecap = trigger_ff_script:new({
gren2 = 4,
item = "",
team = 0,
jetpackfuel = 100,
jetpackfuelpct = 100,
-- teampoints and fortpoints are defined as functions here for backwards compatibility (to always get the current value of the global variable)
-- when defining capture points that inherit from basecap, teampoints and fortpoints can be set to numbers instead
teampoints = function(cap, team) return POINTS_PER_CAPTURE end,
@ -474,7 +474,7 @@ function basecap:ontrigger ( trigger_entity )
if self.gren2 ~= nil and self.gren2 ~= 0 then player:AddAmmo(Ammo.kGren2, self.gren2) end
-- restock player specials
if self.jetpackfuel ~= nil then player:SetJetpackFuel(self.jetpackfuel) end
if self.jetpackfuelpct ~= nil then player:SetJetpackFuelPercent(self.jetpackfuelpct) end
self:oncapture( player, v )
end