Merge pull request #14 from xamionex/dev

xamionex · web-flow · commit 46083812baaa · 2022-01-22T23:24:19.000+01:00
Merge Dev
diff --git a/keyvalues/scripts/weapons/mp_weapon_arena3.txt b/keyvalues/scripts/weapons/mp_weapon_arena3.txt
@@ -1,8 +1,8 @@
 WeaponData
 {
 	"fire_rate"   									"1.3"
-	"holster_time"									"0.01"
-	"deploy_time" 									"0.01"
-	"lower_time"  									"0.01"
-	"raise_time"  									"0.01"
+	"holster_time"									"0.3"
+	"deploy_time" 									"0.3"
+	"lower_time"  									"0.3"
+	"raise_time"  									"0.3"
 }
diff --git a/keyvalues/scripts/weapons/mp_weapon_dmr.txt b/keyvalues/scripts/weapons/mp_weapon_dmr.txt
@@ -6,9 +6,9 @@ WeaponData
 	"spread_stand_hip_sprint"                       "0"
 	"spread_crouch_hip"   							"0"
 	"spread_air_hip"  								"0"
-	"spread_stand_ads"								"0.0" //"0.5"
-	"spread_crouch_ads"   							"0.0" //"0.5"
-	"spread_air_ads"  								"0.0" //"0.5"
+	"spread_stand_ads"								"0.0" //"0.3"
+	"spread_crouch_ads"   							"0.0" //"0.3"
+	"spread_air_ads"  								"0.0" //"0.3"
 	"spread_kick_on_fire_stand_hip"   				"0"
 	"spread_kick_on_fire_crouch_hip"  				"0"
 	"spread_kick_on_fire_air_hip" 					"0"
@@ -29,10 +29,10 @@ WeaponData
 	"bolt_speed"									"12100"
 	"bolt_gravity_enabled"							"0"
 	"stat_accuracy"   								"100"
-	"holster_time"									"0.01"
-	"deploy_time" 									"0.01"
-	"lower_time"  									"0.01"
-	"raise_time"  									"0.01"
+	"holster_time"									"0.3"
+	"deploy_time" 									"0.3"
+	"lower_time"  									"0.3"
+	"raise_time"  									"0.3"
 	// Ammo
 	"reload_enabled"								"0"
 	"empty_reload_only"								"1"
diff --git a/keyvalues/scripts/weapons/mp_weapon_doubletake.txt b/keyvalues/scripts/weapons/mp_weapon_doubletake.txt
@@ -6,9 +6,9 @@ WeaponData
 	"spread_stand_hip_sprint"                       "0"
 	"spread_crouch_hip"   							"0"
 	"spread_air_hip"  								"0"
-	"spread_stand_ads"								"0.0" //"0.5"
-	"spread_crouch_ads"   							"0.0" //"0.5"
-	"spread_air_ads"  								"0.0" //"0.5"
+	"spread_stand_ads"								"0.0" //"0.3"
+	"spread_crouch_ads"   							"0.0" //"0.3"
+	"spread_air_ads"  								"0.0" //"0.3"
 	"spread_kick_on_fire_stand_hip"   				"0"
 	"spread_kick_on_fire_crouch_hip"  				"0"
 	"spread_kick_on_fire_air_hip" 					"0"
@@ -31,10 +31,10 @@ WeaponData
 	"bolt_speed"									"12100"
 	"bolt_gravity_enabled"							"0"
 	"stat_accuracy"   								"100"
-	"holster_time"									"0.01"
-	"deploy_time" 									"0.01"
-	"lower_time"  									"0.01"
-	"raise_time"  									"0.01"
+	"holster_time"									"0.3"
+	"deploy_time" 									"0.3"
+	"lower_time"  									"0.3"
+	"raise_time"  									"0.3"
 	// Ammo
 	"rechamber_time"								"0"
 	"reload_enabled"								"0"
diff --git a/keyvalues/scripts/weapons/mp_weapon_epg.txt b/keyvalues/scripts/weapons/mp_weapon_epg.txt
@@ -1,18 +1,18 @@
 WeaponData
 {
 	"projectile_launch_speed"						"2000"
-	"projectile_gravity_scale"						"0.5"
+	"projectile_gravity_scale"						"0.3"
 	"fire_rate"   									"1.3"
 	// Damage
 	"allow_headshots" 								"1"
 	"headshot_distance" 							"5000"
 	"damage_headshot_scale"							"1.25"
 	"impulse_force"									"999999"
 	"impulse_force_explosions"						"999999"
-	"holster_time"									"0.01"
-	"deploy_time" 									"0.01"
-	"lower_time"  									"0.01"
-	"raise_time"  									"0.01"
+	"holster_time"									"0.3"
+	"deploy_time" 									"0.3"
+	"lower_time"  									"0.3"
+	"raise_time"  									"0.3"
 
 	MP_BASE
 	{
diff --git a/keyvalues/scripts/weapons/mp_weapon_shotgun_pistol.txt b/keyvalues/scripts/weapons/mp_weapon_shotgun_pistol.txt
@@ -6,9 +6,9 @@ WeaponData
 	"spread_stand_hip_sprint"                       "0"
 	"spread_crouch_hip"   							"0"
 	"spread_air_hip"  								"0"
-	"spread_stand_ads"								"0.0" //"0.5"
-	"spread_crouch_ads"   							"0.0" //"0.5"
-	"spread_air_ads"  								"0.0" //"0.5"
+	"spread_stand_ads"								"0.0" //"0.3"
+	"spread_crouch_ads"   							"0.0" //"0.3"
+	"spread_air_ads"  								"0.0" //"0.3"
 	"spread_kick_on_fire_stand_hip"   				"0"
 	"spread_kick_on_fire_crouch_hip"  				"0"
 	"spread_kick_on_fire_air_hip" 					"0"
@@ -27,10 +27,10 @@ WeaponData
 	"spread_decay_rate"   							"40"
 	// Behavior
 	"stat_accuracy"   								"100"
-	"holster_time"									"0.01"
-	"deploy_time" 									"0.01"
-	"lower_time"  									"0.01"
-	"raise_time"  									"0.01"
+	"holster_time"									"0.3"
+	"deploy_time" 									"0.3"
+	"lower_time"  									"0.3"
+	"raise_time"  									"0.3"
 	// Ammo
 	"reload_enabled"								"0"
 	"empty_reload_only"								"1"
diff --git a/keyvalues/scripts/weapons/mp_weapon_sniper.txt b/keyvalues/scripts/weapons/mp_weapon_sniper.txt
@@ -6,9 +6,9 @@ WeaponData
 	"spread_stand_hip_sprint"                       "0"
 	"spread_crouch_hip"   							"0"
 	"spread_air_hip"  								"0"
-	"spread_stand_ads"								"0.0" //"0.5"
-	"spread_crouch_ads"   							"0.0" //"0.5"
-	"spread_air_ads"  								"0.0" //"0.5"
+	"spread_stand_ads"								"0.0" //"0.3"
+	"spread_crouch_ads"   							"0.0" //"0.3"
+	"spread_air_ads"  								"0.0" //"0.3"
 	"spread_kick_on_fire_stand_hip"   				"0"
 	"spread_kick_on_fire_crouch_hip"  				"0"
 	"spread_kick_on_fire_air_hip" 					"0"
@@ -31,10 +31,10 @@ WeaponData
 	"bolt_speed"									"12100"
 	"bolt_gravity_enabled"							"0"
 	"stat_accuracy"   								"100"
-	"holster_time"									"0.01"
-	"deploy_time" 									"0.01"
-	"lower_time"  									"0.01"
-	"raise_time"  									"0.01"
+	"holster_time"									"0.3"
+	"deploy_time" 									"0.3"
+	"lower_time"  									"0.3"
+	"raise_time"  									"0.3"
 	// Ammo
 	"rechamber_time"								"0"
 	"reload_enabled"								"0"
diff --git a/keyvalues/scripts/weapons/mp_weapon_softball.txt b/keyvalues/scripts/weapons/mp_weapon_softball.txt
@@ -1,18 +1,18 @@
 WeaponData
 {
 	"projectile_launch_speed"						"2000"
-	"projectile_gravity_scale"						"0.5"
+	"projectile_gravity_scale"						"0.3"
 	"fire_rate"   									"1.3"
 	// Damage
 	"allow_headshots" 								"1"
 	"headshot_distance" 							"5000"
 	"damage_headshot_scale"							"1.25"
 	"impulse_force"									"9999999"
 	"impulse_force_explosions"						"9999999"
-	"holster_time"									"0.01"
-	"deploy_time" 									"0.01"
-	"lower_time"  									"0.01"
-	"raise_time"  									"0.01"
+	"holster_time"									"0.3"
+	"deploy_time" 									"0.3"
+	"lower_time"  									"0.3"
+	"raise_time"  									"0.3"
 
 	MP_BASE
 	{
diff --git a/keyvalues/scripts/weapons/mp_weapon_wingman_n.txt b/keyvalues/scripts/weapons/mp_weapon_wingman_n.txt
@@ -6,9 +6,9 @@ WeaponData
 	"spread_stand_hip_sprint"                       "0"
 	"spread_crouch_hip"   							"0"
 	"spread_air_hip"  								"0"
-	"spread_stand_ads"								"0.0" //"0.5"
-	"spread_crouch_ads"   							"0.0" //"0.5"
-	"spread_air_ads"  								"0.0" //"0.5"
+	"spread_stand_ads"								"0.0" //"0.3"
+	"spread_crouch_ads"   							"0.0" //"0.3"
+	"spread_air_ads"  								"0.0" //"0.3"
 	"spread_kick_on_fire_stand_hip"   				"0"
 	"spread_kick_on_fire_crouch_hip"  				"0"
 	"spread_kick_on_fire_air_hip" 					"0"
@@ -29,10 +29,10 @@ WeaponData
 	"bolt_speed"									"12100"
 	"bolt_gravity_enabled"							"0"
 	"stat_accuracy"   								"100"
-	"holster_time"									"0.01"
-	"deploy_time" 									"0.01"
-	"lower_time"  									"0.01"
-	"raise_time"  									"0.01"
+	"holster_time"									"0.3"
+	"deploy_time" 									"0.3"
+	"lower_time"  									"0.3"
+	"raise_time"  									"0.3"
 	// Ammo
 	"reload_enabled"								"0"
 	"empty_reload_only"								"1"
diff --git a/mod.json b/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.3",
+	"Version": "1.1.4",
 	"LoadPriority": 2
 }

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`WeaponData`
`2`	`2`	`{`
`3`	`3`	`"fire_rate" "1.3"`
`4`		`- "holster_time" "0.01"`
`5`		`- "deploy_time" "0.01"`
`6`		`- "lower_time" "0.01"`
`7`		`- "raise_time" "0.01"`
	`4`	`+ "holster_time" "0.3"`
	`5`	`+ "deploy_time" "0.3"`
	`6`	`+ "lower_time" "0.3"`
	`7`	`+ "raise_time" "0.3"`
`8`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"Name" : "xamionex.UnholyTrinity",`
`3`	`3`	`"Description" : "This is my custom weapons for the UnholyTrinity server\n\nThis is a server side script, no need for clients to download",`
`4`		`- "Version": "1.1.3",`
	`4`	`+ "Version": "1.1.4",`
`5`	`5`	`"LoadPriority": 2`
`6`	`6`	`}`