Merge pull request #32 from fluffy-servers/1.3.9

1.3.9 Update

fluffy_dodgeball/entities/entities/db_dodgeball.lua

@@ -19,6 +19,11 @@ function ENT:Initialize()
 
     self.CurrentBounces = 0
     self.LastTime = CurTime()
+
+    -- Attempt to unstuck balls in the world
+    if util.IsInWorld(self:GetPos() - Vector(0, 0, self.Size/2)) then
+        self:SetPos(self:GetPos() + Vector(0, 0, self.Size + 8))
+    end
 end
 
 -- Destroy the ball if damaged by trigger_hurt entities, otherwise apply physics damage

fluffy_dodgeball/gamemode/init.lua

@@ -84,6 +84,11 @@ function GM:CollectBall(ball, team)
     ball:SetNWVector("RColor", c)
 end
 
+-- Only balls can be picked up in Dodgeball
+function GM:GravGunPickupAllowed(ply, ent)
+    return ent:GetClass() == "db_dodgeball"
+end
+
 -- Handle collection when the gravity gun picks up a ball
 function GM:GravGunOnPickedUp(ply, ent)
     if ply:Team() ~= TEAM_BLUE and ply:Team() ~= TEAM_RED then return end

fluffy_duckhunt/gamemode/shared.lua

@@ -1,10 +1,4 @@
---[[
-    Robert A Fraser 2018
-    Duck Hunt
-    Originally by Niandra Lades
-]]
---
-DeriveGamemode("fluffy_mg_base")
+DeriveGamemode("fluffy_mg_base")
 GM.Name = "Duck Hunt"
 GM.Author = "FluffyXVI"
 GM.HelpText = [[

fluffy_incoming/entities/entities/inc_checkpoint_activator.lua

@@ -0,0 +1,16 @@
+ENT.Type = "brush"
+
+function ENT:StartTouch(ent)
+    if not ent:IsPlayer() then return end
+    if not GAMEMODE:InRound() then return end
+
+    GAMEMODE:CheckpointTriggered(ent, self.CheckpointStage, self.CheckpointMessage)
+end
+
+function ENT:KeyValue(key, value)
+    if key == "stage" then
+        self.CheckpointStage = tonumber(value)
+    elseif key == "message" then
+        self.CheckpointMessage = value
+    end
+end

fluffy_incoming/entities/entities/inc_checkpoint_spawn.lua

@@ -0,0 +1,7 @@
+ENT.Type = "point"
+
+function ENT:KeyValue(key, value)
+    if key == "stage" then
+        self.CheckpointStage = tonumber(value)
+    end
+end

fluffy_incoming/entities/entities/inc_model_control.lua

@@ -0,0 +1,17 @@
+ENT.Type = "point"
+
+ENT.CustomPreset = {}
+
+function ENT:KeyValue(key, value)
+    if key == "preset" then
+        if value == "Custom" then value = "Custom" .. self:EntIndex() end
+        self.Preset = value
+    elseif key == "delay" then
+        self.CustomPreset.delay = tonumber(value)
+    elseif key == "material" then
+        self.CustomPreset.material = value
+    elseif string.StartWith(key, "model") then
+        if not self.CustomPreset.models then self.CustomPreset.models = {} end
+        table.insert(self.CustomPreset.models, value)
+    end
+end

fluffy_incoming/entities/entities/inc_prop_remover.lua

@@ -0,0 +1,7 @@
+ENT.Type = "brush"
+
+function ENT:Touch(ent)
+    if ent:IsPlayer() then return end
+    if ent:GetClass() == "prop_ragdoll" then return end
+    ent:Remove()
+end

fluffy_incoming/entities/entities/inc_prop_spawner.lua

@@ -0,0 +1 @@
+ENT.Type = "point"

fluffy_incoming/entities/entities/inc_winners_area.lua

@@ -0,0 +1,9 @@
+ENT.Type = "brush"
+
+function ENT:StartTouch(ent)
+    if not ent:IsPlayer() then return end
+    if not GAMEMODE:InRound() then return end
+
+    self:Remove()
+    GAMEMODE:IncomingVictory(ent)
+end

fluffy_incoming/entities/entities/slope_prop_remover.lua

@@ -0,0 +1 @@
+ENT.Base = "inc_prop_remover"

fluffy_incoming/entities/entities/slope_prop_spawner.lua

@@ -0,0 +1 @@
+ENT.Base = "inc_prop_spawner"

fluffy_incoming/entities/entities/slope_winners_area.lua

@@ -0,0 +1 @@
+ENT.Base = "inc_winners_area"