Merge pull request #15 from xamionex/dev

Merge Dev

Author: xamionex

keyvalues/scripts/weapons/mp_weapon_softball.txt

@@ -2,7 +2,7 @@ WeaponData
 {
 	"projectile_launch_speed"						"2000"
 	"projectile_gravity_scale"						"0.3"
-	"fire_rate"   									"1.3"
+	"fire_rate"   									"3"
 	// Damage
 	"allow_headshots" 								"1"
 	"headshot_distance" 							"5000"

mod.json

@@ -1,6 +1,6 @@
 {
 	"Name" : "xamionex.UnholyTrinity",
 	"Description" : "This is my custom weapons for the UnholyTrinity server\n\nThis is a server side script, no need for clients to download",
-	"Version": "1.1.4",
+	"Version": "1.1.5",
 	"LoadPriority": 2
 }

mod/scripts/vscripts/lobby/_lobby.gnut

@@ -15,6 +15,8 @@ void function Lobby_Init()
 	SetPlaylistVarOverride( "no_pilot_collision", "1" )
 	SetPlaylistVarOverride( "run_epilogue", "0" )
 	SetPlaylistVarOverride( "classic_mp", "0" )
+	SetPlaylistVarOverride( "scorelimit", "200" )
+	SetPlaylistVarOverride( "timelimit", "30" )
 
 	if ( IsPrivateMatch() || GetCurrentPlaylistName() == "private_match" ) // IsPrivateMatch() doesn't seem to be reliable on local server start
 		PrivateLobby_Init()