multiple changes

- disable non-chat join messages
- if a player quits or a new map is started their data is reset
- always return false for IsDev()
- add more props to the list
- remove Xdefm and dev categories

flood/gamemode/server/sv_player.lua

@@ -25,11 +25,13 @@ function GM:PlayerInitialSpawn(ply)
 		end)
 	end
 	ply.SpawnTime = CurTime()
+	--[[
 	if(ply:IsDev())then
 		PrintMessage(HUD_PRINTCENTER,"Dev of flood 2.2 has joined the server!!!")
 		return
 	end
 	PrintMessage(HUD_PRINTCENTER, ply:Nick().." has joined the server! say hello to "..ply:Nick().."!")
+	]]--
 end
 
 function GM:PlayerSpawn( ply )
@@ -219,6 +221,7 @@ end
 -----------------------------------------------------------------------------------------------
 function PlayerMeta:LoadData()
 	local data = {}
+	--[[
 	if file.Exists("flood/"..self:UniqueID()..".txt", "DATA") then
 		data = util.KeyValuesToTable(file.Read("flood/"..self:UniqueID()..".txt", "DATA"))
 		self.Allow = true
@@ -234,6 +237,17 @@ function PlayerMeta:LoadData()
 		self.Allow = true
 		return data
 	end
+	]]--
+
+	self:Save()
+	data = util.KeyValuesToTable(file.Read("flood/"..self:UniqueID()..".txt", "DATA"))
+	
+	-- Initialize cash to a value
+	data.cash = 25000
+	-- Weapons are initialized elsewhere
+	self:Save()
+	self.Allow = true
+	return data
 end
 
 function PlayerLeft(ply)

flood/gamemode/shared/sh_meta.lua

@@ -17,9 +17,6 @@ function MetaPlayer:IsDonator()
 end
 
 function MetaPlayer:IsDev()
-	if(Devs[self:SteamID()])then
-		return true
-	end
 	return false
 end
 

flood/gamemode/shared/sh_shoplist.lua

@@ -7,13 +7,16 @@ Weapons = {}
 -- Prop categories
 PropCategories[1] = "Bouyant Props"
 PropCategories[2] = "Armor Props"
-PropCategories[3] = "Free Props"
+PropCategories[3] = "Fun Props"
+PropCategories[4] = "Free Props"
 -- Prop catergories price
 Pcp[3]=0
 -- Weapon categories
 WeaponCategories[1] = "Basic Weapons"
+--[[
 WeaponCategories[2] = "Xdefm fishing mod"
 WeaponCategories[3] = "Dev only"
+]]--
 function GM:AddProp(tbl)
     if(tbl.Price==nil)then
         if(Pcp[tbl.Group])then
@@ -60,6 +63,30 @@ Props[26] = {Model = "models/props_interiors/VendingMachineSoda01a_door.mdl", Gr
 Props[27] = {Model = "models/props_building_details/Storefront_Template001a_Bars.mdl", Group = 2, Price = 300, Health = 350, DonatorOnly = false, Description = "Window Bars"}
 Props[28] = {Model = "models/props_borealis/bluebarrel001.mdl", Group = 1, Price = 50, Health = 120, DonatorOnly = false, Description = "Blue barrel"}
 Props[29] = {Model = "models/props_wasteland/cafeteria_table001a.mdl",Group=1,Price=120,Health=150,Description="Cafeteria Table",rdescription="Just a Cafeteria tbl.",}
+Props[30] = {Model = "models/props_c17/statue_horse.mdl", Group = 3, Price = 1000, Health = 2000, DonatorOnly = false, Description = "Horse"}
+Props[31] = {Model = "models/props_lab/servers.mdl", Group = 2, Price = 500, Health = 800, DonatorOnly = false, Description = "Servers"}
+Props[32] = {Model = "models/props_junk/wood_crate002a.mdl", Group = 1, Price = 100, Health = 400, DonatorOnly = false, Description = "Large Wooden Box"}
+Props[33] = {Model = "models/props_junk/TrashDumpster02.mdl", Group = 2, Price = 1000, Health = 2000, DonatorOnly = false, Description = "Trash Dumpster 1"}
+Props[34] = {Model = "models/props_junk/TrashDumpster02b.mdl", Group = 2, Price = 1000, Health = 800, DonatorOnly = false, Description = "Trash Dumpster 2"}
+Props[35] = {Model = "models/props_junk/MetalBucket02a.mdl", Group = 3, Price = 100, Health = 200, DonatorOnly = false, Description = "Bucket"}
+Props[36] = {Model = "models/props_combine/weaponstripper.mdl", Group = 3, Price = 400, Health = 400, DonatorOnly = false, Description = "Propeller"}
+Props[37] = {Model = "models/props_combine/combine_bridge_b.mdl", Group = 3, Price = 500, Health = 200, DonatorOnly = false, Description = "Bridge"}
+Props[38] = {Model = "models/props_combine/combine_monitorbay.mdl", Group = 3, Price = 900, Health = 1100, DonatorOnly = false, Description = "Monitor"}
+Props[39] = {Model = "models/props_combine/combine_fence01a.mdl", Group = 2, Price = 1000, Health = 2000, DonatorOnly = false, Description = "Fence"}
+Props[40] = {Model = "models/maxofs2d/logo_gmod_b.mdl", Group = 3, Price = 400, Health = 400, DonatorOnly = false, Description = "G"}
+Props[41] = {Model = "models/maxofs2d/gm_painting.mdl", Group = 3, Price = 300, Health = 500, DonatorOnly = false, Description = "Painting"}
+Props[42] = {Model = "models/xqm/jetbody2.mdl", Group = 3, Price = 700, Health = 1000, DonatorOnly = false, Description = "Hot Air Balloon 1"}
+Props[43] = {Model = "models/balloons/hot_airballoon.mdl", Group = 3, Price = 700, Health = 1000, DonatorOnly = false, Description = "Hot Air Balloon 2"}
+Props[44] = {Model = "models/xqm/jetbody3.mdl", Group = 3, Price = 700, Health = 1000, DonatorOnly = false, Description = "Grey Machine 1"}
+Props[45] = {Model = "models/xqm/jetbody3_s2.mdl", Group = 3, Price = 1000, Health = 1500, DonatorOnly = false, Description = "Grey Machine 2"}
+Props[46] = {Model = "models/xqm/hoverboard.mdl", Group = 3, Price = 1000, Health = 1500, DonatorOnly = false, Description = "Hoverboard"}
+Props[47] = {Model = "models/props_vehicles/wagon001a_phy.mdl", Group = 2, Price = 1000, Health = 1500, DonatorOnly = false, Description = "Wagon"}
+Props[48] = {Model = "models/props_phx/sp_screen.mdl", Group = 3, Price = 100, Health = 200, DonatorOnly = false, Description = "Screen"}
+Props[49] = {Model = "models/props_phx/misc/bunker01.mdl", Group = 3, Price = 2000, Health = 4000, DonatorOnly = false, Description = "Bunker"}
+Props[50] = {Model = "models/props_phx/games/chess/board.mdl", Group = 3, Price = 1500, Health = 2000, DonatorOnly = false, Description = "Chessboard"}
+Props[51] = {Model = "models/props_canal/boat001a.mdl", Group = 1, Price = 1000, Health = 1100, DonatorOnly = false, Description = "Boat 1"}
+Props[52] = {Model = "models/props_canal/boat001b.mdl", Group = 1, Price = 1000, Health = 1100, DonatorOnly = false, Description = "Boat 2"}
+Props[53] = {Model = "models/props_canal/boat002b.mdl", Group = 1, Price = 1000, Health = 1100, DonatorOnly = false, Description = "Boat 3"}
 -- Weapons
 -- OMFG,STOP ADDING SOME DONATOR ONLY WEAPON,IF YOU WANT JUST MAKE IT BALANCE DAMN.
 Weapons[1] = {Model = "models/weapons/w_crossbow.mdl", Group = 1, Class = "weapon_crossbow", Name = "Crossbow", Price = 15000, Ammo = 1000, AmmoClass = "XBowBolt", Damage = 50, DonatorOnly = false}
@@ -73,15 +100,17 @@ Weapons[9] = {Model = "models/weapons/w_smg1.mdl", Group = 1, Class = "weapon_sm
 Weapons[10] = {Model = "models/weapons/w_irifle.mdl", Group = 1, Class = "weapon_ar2", Name = "AR2", Price = 7500, Ammo = 1000, AmmoClass = "AR2", Damage = 8, DonatorOnly = false}
 Weapons[11] = {Model = "models/weapons/w_Physics.mdl",Group=1,Class='weapon_physcannon',Name="Pusher",Price=1500,Ammo=0,AmmoClass="",Damage=-10}
 Weapons[11] = {description="What? You think this is crossbow? pls look at other crossbow okay? \n This is grapple,Used to move you boat",Model = "models/weapons/w_crowbar.mdl",Group=1,Class='weapon_grapple',Name="NOT CROSSBOW,Grapple",Price=1500,Ammo=0,AmmoClass="",Damage=-10}
-Weapons[12] = {Model = "models/weapons/w_stunbaton.mdl",Group=3,Class='weapon_stunstick',Name="Super stick",Price=0,Ammo=0,AmmoClass="",DevOnly=true}
+--Weapons[12] = {Model = "models/weapons/w_stunbaton.mdl",Group=3,Class='weapon_stunstick',Name="Super stick",Price=0,Ammo=0,AmmoClass="",DevOnly=true}
 Weapons[13] = {Model = "models/Gibs/HGIBS.mdl",Group=1,Class="weapon_fists",Name='Fist',Price=0,Ammo=0,AmmoClass="",Damage=6}
+--[[
 if(istable(weapons.Get('weapon_xdefm_rod')))then
   Weapons[#Weapons+1]={description="Model from oc_diving_v9 huh?",Model="models/oc_diving/rod.mdl",Group=2,Class="weapon_xdefm_rod",Name="Fishing rod",Price=-1,Ammo=0,AmmoClass="",Damage=0}
   Weapons[#Weapons+1]={description="THE INVENTORY",Model="models/weapons/w_package.mdl",Group=2,Class="weapon_xdefm_inventory",Name="Fishing Inventory",Price=-5,Ammo=0,AmmoClass="",Damage=0}
   Weapons[#Weapons+1]={description="LETS GO TRADE!",Model="models/weapons/w_suitcase_passenger.mdl",Group=2,Class="weapon_xdefm_trade",Name="Fishing Trace",Price=-10,Ammo=0,AmmoClass="",Damage=0}
 end
-GM:AddProp({Model="models/props_c17/FurnitureDrawer001a.mdl",Group=3,Description="Furniture Drawer",Health=40,Price=0})
-GM:AddProp({Model="models/Items/item_item_crate.mdl",Group=3,Description="BOX",Health=25,Price=0})
-GM:AddProp({Model="models/props_junk/watermelon01.mdl",Group=3,Description="MELON",Health=50,Price=0})
-GM:AddProp({Model="models/props_trainstation/trainstation_ornament002.mdl",Health=80,Group=3,Description="I dont know",Price=0,rdescription="You think this is a tesla tower?"})
-GM:AddProp({Model="models/props_phx/construct/wood/wood_panel1x1.mdl",Group=3,Description="Wooden panel.",Price=0,Health=35})
+]]--
+GM:AddProp({Model="models/props_c17/FurnitureDrawer001a.mdl",Group=4,Description="Furniture Drawer",Health=40,Price=0})
+GM:AddProp({Model="models/Items/item_item_crate.mdl",Group=4,Description="BOX",Health=25,Price=0})
+GM:AddProp({Model="models/props_junk/watermelon01.mdl",Group=4,Description="MELON",Health=50,Price=0})
+GM:AddProp({Model="models/props_trainstation/trainstation_ornament002.mdl",Health=80,Group=4,Description="I dont know",Price=0,rdescription="You think this is a tesla tower?"})
+GM:AddProp({Model="models/props_phx/construct/wood/wood_panel1x1.mdl",Group=4,Description="Wooden panel.",Price=0,Health=35})