Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Merge pull request #117 from xToken/Dev

Dev
  • Loading branch information...
commit c102b49bd952b8368091db69812ce80d967569a8 2 parents a938658 + 9e2704e
Matt authored
2  Readme.txt
... ... @@ -1,4 +1,4 @@
1 1 For Servers
2 2 add -mods 5f7771c to your server command line variables, and rename the ns2c folder to
3   -m5f7771c_1349643439. Then place that folder in the location set with the -modstorage command
  3 +m5f7771c_1349656869. Then place that folder in the location set with the -modstorage command
4 4 line argument.
4 lua/Balance.lua
@@ -307,8 +307,8 @@ kSwipeDamageType = kDamageType.Normal
307 307 kSwipeEnergyCost = 6.5
308 308 kSwipeDelay = 0.48
309 309
310   -kStartBlinkEnergyCost = 8
311   -kBlinkEnergyCost = 100
  310 +kStartBlinkEnergyCost = 10
  311 +kBlinkEnergyCost = 60
312 312
313 313 kMetabolizeEnergyCost = 25
314 314 kMetabolizeEnergyGain = 35
59 lua/Fade.lua
@@ -49,10 +49,7 @@ Fade.kAcceleration = 50
49 49 Fade.kAirAcceleration = 25
50 50 Fade.kBlinkAirAcceleration = 40
51 51 Fade.kBlinkAirAccelerationDuration = 2
52   -Fade.kBlinkAcceleration = 50
53   -Fade.kVerticleBlinkAcceleration = 150
54   -Fade.kViewDeadZone = 0.15
55   -Fade.kReversalThreshold = 0.3
  52 +Fade.kBlinkAcceleration = 20
56 53
57 54 if Server then
58 55 Script.Load("lua/Fade_Server.lua")
@@ -236,35 +233,8 @@ function Fade:GetMaxSpeed(possible)
236 233
237 234 end
238 235
239   -function Fade:ModifyVelocity(input, velocity)
240   -
  236 +function Fade:ModifyVelocity(input, velocity)
241 237 Alien.ModifyVelocity(self, input, velocity)
242   -
243   - if self:GetIsBlinking() then
244   -
245   - self:PerformMovement( velocity * input.time, 1, velocity )
246   - local viewCoords = self:GetViewAngles():GetCoords()
247   - local zAxis = viewCoords.zAxis
248   - local upangle = math.abs(zAxis.y)
249   -
250   - self.onGroundNeedsUpdate = true
251   - if self:GetIsOnGround() and velocity.y < 4 then
252   - velocity.y = velocity.y + math.sqrt(math.abs(2 * self:GetJumpHeight() * self:GetGravityForce(input)))
253   - else
254   - //Convert velocity instantly if opposite direction for additional responsiveness
255   - if upangle > Fade.kViewDeadZone then
256   - if upangle > Fade.kReversalThreshold and Sign(velocity.y) ~= Sign(zAxis.y) then
257   - if Sign(zAxis.y) > 0 and velocity.y < 0 then
258   - velocity.y = 10
259   - elseif Sign(zAxis.y) < 0 and velocity.y > 0 then
260   - velocity.y = 0
261   - end
262   - end
263   - velocity.y = velocity.y + (Fade.kVerticleBlinkAcceleration * ((1 - math.cos(zAxis.y)) * input.time))
264   - end
265   - end
266   - end
267   -
268 238 end
269 239
270 240 function Fade:GetMass()
@@ -283,6 +253,10 @@ function Fade:GetRecentlyBlinked()
283 253 return Shared.GetTime() - self.etherealEndTime < Fade.kBlinkAirAccelerationDuration
284 254 end
285 255
  256 +function Fade:GetBlinkCooldown()
  257 + return Shared.GetTime() - self.etherealEndTime < Blink.kMinEnterEtherealTime
  258 +end
  259 +
286 260 function Fade:GetRecentlyJumped()
287 261 return self.timeOfLastJump ~= nil and self.timeOfLastJump + 0.2 > Shared.GetTime()
288 262 end
@@ -311,21 +285,30 @@ function Fade:GetGravityAllowed()
311 285 return true
312 286 end
313 287
314   -function Fade:TriggerBlink()
  288 +function Fade:OnBlink()
315 289 self.ethereal = true
316 290 self.onGroundNeedsUpdate = false
317 291 self.onGround = false
318 292 self.jumping = true
319 293 end
320 294
  295 +function Fade:OnBlinking(input)
  296 +
  297 + self.onGroundNeedsUpdate = true
  298 + local newVelocity = self:GetViewCoords().zAxis * Fade.kBlinkAcceleration * input.time
  299 + local velocity = self:GetVelocity()
  300 +
  301 + if self:GetIsOnGround() and velocity.y < 4 then
  302 + newVelocity.y = newVelocity.y + math.sqrt(math.abs(2 * self:GetJumpHeight() * self:GetGravityForce(input)))
  303 + end
  304 +
  305 + self:SetVelocity(velocity + newVelocity)
  306 +
  307 +end
  308 +
321 309 function Fade:OverrideInput(input)
322 310
323 311 Player.OverrideInput(self, input)
324   -
325   - if self:GetIsBlinking() then
326   - input.move.z = 1
327   - input.move.x = 0
328   - end
329 312
330 313 return input
331 314
8 lua/Marine.lua
@@ -703,11 +703,11 @@ function Marine:Drop(weapon, ignoreDropTimeLimit, ignoreReplacementWeapon)
703 703
704 704 if Server then
705 705
706   - if ignoreReplacementWeapon ~= true and weapon.GetReplacementWeaponMapName then
707   - self:GiveItem(weapon:GetReplacementWeaponMapName(), false)
  706 + //if ignoreReplacementWeapon ~= true and weapon.GetReplacementWeaponMapName then
  707 + //self:GiveItem(weapon:GetReplacementWeaponMapName(), false)
708 708 // the client expects the next weapon is going to be selected (does not know about the replacement).
709   - self:SelectNextWeaponInDirection(1)
710   - end
  709 + //self:SelectNextWeaponInDirection(1)
  710 + //end
711 711
712 712 end
713 713
19 lua/Marine_Client.lua
@@ -349,25 +349,6 @@ function Marine:UpdateMisc(input)
349 349
350 350 end
351 351
352   -// Give dynamic camera motion to the player
353   -/*
354   -function Marine:PlayerCameraCoordsAdjustment(cameraCoords)
355   -
356   - if self:GetIsFirstPerson() then
357   -
358   - if self:GetIsStunned() then
359   - local attachPointOffset = self:GetAttachPointOrigin("Head") - cameraCoords.origin
360   - attachPointOffset.x = attachPointOffset.x * .5
361   - attachPointOffset.z = attachPointOffset.z * .5
362   - cameraCoords.origin = cameraCoords.origin + attachPointOffset
363   - end
364   -
365   - end
366   -
367   - return cameraCoords
368   -
369   -end*/
370   -
371 352 function Marine:OnCountDown()
372 353
373 354 Player.OnCountDown(self)
12 lua/Marine_Server.lua
@@ -225,6 +225,18 @@ function Marine:GiveItem(itemMapName)
225 225
226 226 end
227 227
  228 + if itemMapName == Welder.kMapName then
  229 +
  230 + local hgWeapon = self:GetWeapon(HandGrenades.kMapName)
  231 +
  232 + if hgWeapon then
  233 + self:RemoveWeapon(hgWeapon)
  234 + DestroyEntity(hgWeapon)
  235 + continue = true
  236 + end
  237 +
  238 + end
  239 +
228 240 if continue == true then
229 241 return Player.GiveItem(self, itemMapName, setActive)
230 242 end
2  lua/NS2Utility.lua
@@ -1105,7 +1105,7 @@ function SetPlayerPoseParameters(player, viewModel)
1105 1105 viewModel:SetPoseParam("crouch", player:GetCrouchAmount())
1106 1106 viewModel:SetPoseParam("body_yaw", bodyYaw)
1107 1107 viewModel:SetPoseParam("body_yaw_run", bodyYawRun)
1108   - viewModel:SetPoseParam("land_intensity", landIntensity)
  1108 + viewModel:SetPoseParam("land_intensity", 0)
1109 1109
1110 1110 end
1111 1111
2  lua/Onos.lua
@@ -53,7 +53,7 @@ Onos.kHealth = kOnosHealth
53 53 Onos.kArmor = kOnosArmor
54 54 Onos.kChargeEnergyCost = 60
55 55 Onos.kChargeAcceleration = 120
56   -Onos.kChargeUpDuration = .25
  56 +Onos.kChargeUpDuration = .35
57 57 Onos.kChargeDelay = .1
58 58 Onos.kMinChargeDamage = kChargeMinDamage
59 59 Onos.kMaxChargeDamage = kChargeMaxDamage
2  lua/Player_Client.lua
@@ -2135,8 +2135,6 @@ function Player:GetCameraViewCoordsOverride(cameraCoords)
2135 2135 cameraCoords = angles:GetCoords(origin)
2136 2136
2137 2137 end
2138   -
2139   - cameraCoords = self:PlayerCameraCoordsAdjustment(cameraCoords)
2140 2138
2141 2139 end
2142 2140
2  lua/PlayingTeam.lua
@@ -821,7 +821,7 @@ function PlayingTeam:GetPresRecipientCount()
821 821 for i, playerId in ipairs(self.playerIds) do
822 822
823 823 local player = Shared.GetEntity(playerId)
824   - if player and player:GetResources() < kMaxPersonalResources and player:GetIsAlive() then
  824 + if player and player:GetResources() < kMaxPersonalResources then
825 825 recipientCount = recipientCount + 1
826 826 end
827 827
50 lua/Skulk_Client.lua
@@ -27,57 +27,9 @@ end
27 27 function Skulk:UpdateMisc(input)
28 28
29 29 Alien.UpdateMisc(self, input)
30   -
31   - if self.currentCameraRoll == nil then
32   - self.currentCameraRoll = 0
33   - end
34   - if self.goalCameraRoll == nil then
35   - self.goalCameraRoll = 0
36   - end
37   -
38   - //self.currentCameraRoll = LerpGeneric(self.currentCameraRoll, self.goalCameraRoll, math.min(1, input.time * Skulk.kCameraRollSpeedModifier))
39 30
40 31 end
41 32
42 33 function Skulk:GetHeadAttachpointName()
43 34 return "Bone_Tongue"
44   -end
45   -
46   -local gEnableTilt = true
47   -// Tilt the camera based on the wall the Skulk is attached to.
48   -function Skulk:PlayerCameraCoordsAdjustment(cameraCoords)
49   -
50   - if self.wallWalkingNormalCurrent and gEnableTilt then
51   -
52   - local viewModelTiltAngles = Angles()
53   - viewModelTiltAngles:BuildFromCoords(cameraCoords)
54   - // Don't rotate if too close to upside down (on ceiling).
55   - if math.abs(self.wallWalkingNormalCurrent:DotProduct(Vector.yAxis)) > 0.9 then
56   - self.goalCameraRoll = 0
57   - else
58   - local wallWalkingNormalCoords = Coords.GetLookIn( Vector.origin, cameraCoords.zAxis, self.wallWalkingNormalCurrent )
59   - local wallWalkingRoll = Angles()
60   - wallWalkingRoll:BuildFromCoords(wallWalkingNormalCoords)
61   - wallWalkingRoll = wallWalkingRoll.roll
62   - self.goalCameraRoll = (wallWalkingRoll * Skulk.kCameraRollTiltModifier)
63   - end
64   - if self.currentCameraRoll then
65   - viewModelTiltAngles.roll = viewModelTiltAngles.roll + self.currentCameraRoll
66   - end
67   - local viewModelTiltCoords = viewModelTiltAngles:GetCoords()
68   - viewModelTiltCoords.origin = cameraCoords.origin
69   - return viewModelTiltCoords
70   -
71   - end
72   -
73   - return cameraCoords
74   -
75   -end
76   -
77   -function OnCommandSkulkViewTilt(enableTilt)
78   -
79   - gEnableTilt = enableTilt ~= "false"
80   -
81   -end
82   -
83   -Event.Hook("Console_skulk_view_tilt", OnCommandSkulkViewTilt)
  35 +end
22 lua/Weapons/Alien/Blink.lua
@@ -14,8 +14,8 @@ Script.Load("lua/Weapons/Alien/Ability.lua")
@@ -78,8 +78,9 @@ end
@@ -89,6 +90,8 @@ function Blink:OnSecondaryAttack(player)
@@ -123,7 +126,6 @@ function Blink:SetEthereal(player, state)
@@ -132,7 +134,7 @@ function Blink:SetEthereal(player, state)
@@ -148,16 +150,10 @@ function Blink:ProcessMoveOnWeapon(player, input)
4 lua/Weapons/Marine/Welder.lua
@@ -208,6 +208,10 @@ function Welder:GetRange()
208 208 return kWeldRange
209 209 end
210 210
  211 +function Welder:GetReplacementWeaponMapName()
  212 + return HandGrenades.kMapName
  213 +end
  214 +
211 215 // repair rate increases over time
212 216 function Welder:GetRepairRate(repairedEntity)
213 217
3  lua/ns2.deproj
@@ -481,6 +481,9 @@
481 481 <filename>Observatory.lua</filename>
482 482 </file>
483 483 <file>
  484 + <filename>Onos.lua</filename>
  485 + </file>
  486 + <file>
484 487 <filename>Onos_Client.lua</filename>
485 488 </file>
486 489 <file>
4 lua/plugins/plugin_voterandom.lua
@@ -129,7 +129,9 @@ if kDAKConfig and kDAKConfig.VoteRandom and kDAKConfig.VoteRandom.kEnabled then
129 129 table.insert(kDAKOnTeamJoin, function(player, newTeamNumber, force) return VoteRandomJoinTeam(player, newTeamNumber, force) end)
130 130
131 131 function VoteRandomEndGame(winningTeam)
132   - RandomRoundRecentlyEnded = Shared.GetTime()
  132 + if kVoteRandomTeamsEnabled then
  133 + RandomRoundRecentlyEnded = Shared.GetTime()
  134 + end
133 135 end
134 136
135 137 table.insert(kDAKOnGameEnd, function(winningTeam) return VoteRandomEndGame(winningTeam) end)

0 comments on commit c102b49

Please sign in to comment.
Something went wrong with that request. Please try again.