From 603b64b1a93b36f04d25018ec3f53b16dcd84019 Mon Sep 17 00:00:00 2001 From: Alexander Pickering Date: Sat, 30 Apr 2016 15:35:22 -0400 Subject: Fixed plant eating --- gamemode/processes.lua | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'gamemode/processes.lua') diff --git a/gamemode/processes.lua b/gamemode/processes.lua index 4b7fc15..333f404 100644 --- a/gamemode/processes.lua +++ b/gamemode/processes.lua @@ -93,11 +93,11 @@ function PROCESS:OnStart() if ( plant ) then owner = plant:GetNWEntity( "plantowner" ) end if ( self.Data.Entity:GetModel() == "models/props_junk/watermelon01.mdl" ) then - self.SideGain = "Melon_Seeds" + self.SideGain = "Melon Seeds" elseif ( self.Data.Entity:GetModel() == "models/props/cs_italy/orange.mdl" ) then - self.SideGain = "Orange_Seeds" + self.SideGain = "Orange Seeds" elseif ( self.Data.Entity:GetModel() == "models/props/cs_italy/bananna_bunch.mdl" ) then - self.SideGain = "Banana_Seeds" + self.SideGain = "Banana Seeds" end if ( plant ) then @@ -122,7 +122,7 @@ function PROCESS:OnStop() local num = math.random( numstart, numto ) if ( num ~= 0 ) then self.Owner:IncResource( self.SideGain, num ) - self.Owner:SendMessage( string.gsub( self.SideGain, "_", " " ) .. " ( " .. num .. "x )", 3, Color( 10, 200, 10, 255 ) ) + self.Owner:SendMessage( self.SideGain .. " ( " .. num .. "x )", 3, Color( 10, 200, 10, 255 ) ) self.Owner:EmitSound( Sound( "items/ammo_pickup.wav" ) ) end end @@ -407,7 +407,7 @@ function PROCESS:OnStop() if ( num > 50 - self.Owner:GetSkill( "Harvesting" ) - add ) then local amount = math.random( 1, 2 ) - self.Owner:IncResource( "Grain_Seeds", amount ) + self.Owner:IncResource( "Grain Seeds", amount ) self.Owner:IncXP( "Harvesting", math.Clamp( math.Round( 50 / self.Owner:GetSkill( "Harvesting" ) ), 1, 1000 ) ) self.Owner:SendMessage( "Grain Seeds ( " .. amount .. "x )", 3, Color( 10, 200, 10, 255 ) ) self.Owner:EmitSound( Sound( "items/ammo_pickup.wav" ) ) @@ -698,10 +698,10 @@ GMS.RegisterProcess( "SproutCollect", PROCESS ) ---------------------------------------------------------*/ /*Alright, let's refactor this planting code*/ local plant_generic = { - {"Watermelon","Melon_Seeds","melon","PlantMelon"}, - {"Banana","Banana_Seeds","banana","PlantBanana"}, - {"Orange","Orange_Seeds","orange","PlantOrange"}, - {"Grain","Grain_Seeds","grain","PlantGrain"}, + {"Watermelon","Melon Seeds","melon","PlantMelon"}, + {"Banana","Banana Seeds","banana","PlantBanana"}, + {"Orange","Orange Seeds","orange","PlantOrange"}, + {"Grain","Grain Seeds","grain","PlantGrain"}, {"Berry Bush","Berries","berry","PlantBush"}, {"Tree","Sprouts","tree","PlantTree"}, } -- cgit v1.2.3-70-g09d2