Skip to content

Commit

Permalink
Using an actual model for the combustible lemon!
Browse files Browse the repository at this point in the history
  • Loading branch information
Phil Julian committed Apr 8, 2015
1 parent b6e5b8f commit ec28d46
Show file tree
Hide file tree
Showing 9 changed files with 4,887 additions and 12 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@
*.mdl
*.vtx
*.vvd
*.phy
*.phy
*.png
3 changes: 2 additions & 1 deletion addon.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"*.qc",
"*.qci",
"*.png",
".gitignore"
".gitignore",
"*.md"
]
}
5 changes: 0 additions & 5 deletions lua/entities/combustible_lemon/cl_init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,3 @@ include("shared.lua")
ENT.PrintName = "Combustible Lemon"
ENT.Mat = Material("phlenum/entities/combustible_lemon.vmt")

function ENT:Draw()
render.SetMaterial(self.Mat)
render.DrawSprite(self:GetPos(), 16, 16, self:GetColor())
end

5 changes: 3 additions & 2 deletions lua/entities/combustible_lemon/shared.lua
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ ENT.Mass = 1
ENT.Speed = 2000

function ENT:Initialize()
self:SetModel("models/phlenum/entities/combustible_lemon.mdl")
if(SERVER) then
-- server initialization
self:PhysicsInitSphere(SOLID_VPHYSICS, 3)
Expand All @@ -37,9 +38,9 @@ function ENT:Initialize()
if(IsValid(phys)) then
phys:Wake()
phys:SetMass(self.Mass)
phys:SetVelocity(vel)
local rand = math.random(0.1, 0.6)
phys:ApplyForceOffset(vel, Vector(rand, rand, rand))
end
self:SetLocalVelocity(vel)
else
-- client initialization
self:DrawShadow(false)
Expand Down
5 changes: 2 additions & 3 deletions materials/phlenum/entities/combustible_lemon.vmt
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,10 @@
// Creative Commons Attribution-ShareAlike 4.0 International License
//

"UnlitGeneric"
"VertexLitGeneric"
{
$basetexture "phlenum/entities/combustible_lemon"
$bumpmap "phlenum/entities/combustible_lemon_bump"
$surfaceprop "watermelon"
$alpha 1
$alphatest 1
}

Binary file modified materials/phlenum/entities/combustible_lemon.vtf
Binary file not shown.
Binary file not shown.
20 changes: 20 additions & 0 deletions models/phlenum/entities/combustible_lemon.qc
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
//
// Combustible Lemon Launcher (GMOD) by Phil Julian Meyer is licensed under a
// Creative Commons Attribution-ShareAlike 4.0 International License
//

$modelname "phlenum/entities/combustible_lemon.mdl"

$bodygroup "studio"
{
studio "combustible_lemon_ref.smd"
}

$cdmaterials "phlenum/entities"
$surfaceprop "watermelon"

$sequence idle "combustible_lemon_ref.smd" {
fps 30
activity "ACT_IDLE" 1
}

4,858 changes: 4,858 additions & 0 deletions models/phlenum/entities/combustible_lemon_ref.smd

Large diffs are not rendered by default.

0 comments on commit ec28d46

Please sign in to comment.