Skip to content

Commit a219db7

Browse files
xamionexxamionex
authored
Merge pull request #13 from xamionex/dev
Merge Dev
2 parents 0d379ac + d4ad043 commit a219db7

File tree

4 files changed

+60
-3
lines changed

4 files changed

+60
-3
lines changed

‎keyvalues/scripts/weapons/mp_weapon_shotgun_pistol.txt

+57
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
WeaponData
2+
{
3+
// Spread
4+
"spread_stand_hip" "0"
5+
"spread_stand_hip_run" "0"
6+
"spread_stand_hip_sprint" "0"
7+
"spread_crouch_hip" "0"
8+
"spread_air_hip" "0"
9+
"spread_stand_ads" "0.0" //"0.5"
10+
"spread_crouch_ads" "0.0" //"0.5"
11+
"spread_air_ads" "0.0" //"0.5"
12+
"spread_kick_on_fire_stand_hip" "0"
13+
"spread_kick_on_fire_crouch_hip" "0"
14+
"spread_kick_on_fire_air_hip" "0"
15+
"spread_kick_on_fire_stand_ads" "0"
16+
"spread_kick_on_fire_crouch_ads" "0"
17+
"spread_kick_on_fire_air_ads" "0"
18+
"spread_max_kick_stand_hip" "0"
19+
"spread_max_kick_crouch_hip" "0"
20+
"spread_max_kick_air_hip" "0"
21+
"spread_max_kick_stand_ads" "0"
22+
"spread_max_kick_crouch_ads" "0"
23+
"spread_max_kick_air_ads" "0"
24+
"spread_wallrunning" "0"
25+
"spread_wallhanging" "0"
26+
"spread_decay_delay" "0.1"
27+
"spread_decay_rate" "40"
28+
// Behavior
29+
"stat_accuracy" "100"
30+
"holster_time" "0.01"
31+
"deploy_time" "0.01"
32+
"lower_time" "0.01"
33+
"raise_time" "0.01"
34+
// Ammo
35+
"reload_enabled" "0"
36+
"empty_reload_only" "1"
37+
"ammo_no_remove_from_clip" "1"
38+
"ammo_no_remove_from_stockpile" "1"
39+
"fire_rate" "1.3"
40+
// Damage
41+
"damage_near_value" "1000"
42+
"damage_far_value" "1000"
43+
"damage_near_value_titanarmor" "1000"
44+
"damage_far_value_titanarmor" "1000"
45+
// Ricochet
46+
"projectile_damage_reduction_per_bounce" "0.0"
47+
"projectile_damages_owner" "0"
48+
"projectile_ricochet_max_count" "5"
49+
50+
MP_BASE
51+
{
52+
"damage_near_value" "1000"
53+
"damage_far_value" "1000"
54+
"damage_near_value_titanarmor" "1000"
55+
"damage_far_value_titanarmor" "1000"
56+
}
57+
}

‎mod.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"Name" : "xamionex.UnholyTrinity",
33
"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.2",
4+
"Version": "1.1.3",
55
"LoadPriority": 2
66
}

‎mod/scripts/vscripts/gamemodes/_gamemode_ffa.nut

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ const string DEFAULT_WEAPON_PRIMARY = "mp_weapon_wingman_n"
1111
const string DEFAULT_WEAPON_SECONDARY = "mp_weapon_softball"
1212
const string DEFAULT_WEAPON_BACKUP = "mp_weapon_arena3"
1313

14-
const array< string > WEAPONS_LIST = ["mp_weapon_rspn101","mp_weapon_mastiff","mp_weapon_r97","mp_weapon_alternator_smg","mp_weapon_car","mp_weapon_hemlok_smg","mp_weapon_lmg","mp_weapon_lstar","mp_weapon_esaw","mp_weapon_vinson","mp_weapon_hemlok","mp_weapon_g2","mp_weapon_shotgun","mp_weapon_smr","mp_weapon_pulse_lmg","mp_weapon_autopistol","mp_weapon_semipistol","mp_weapon_wingman","mp_weapon_shotgun_pistol","mp_weapon_rocket_launcher","mp_weapon_arc_launcher","mp_weapon_defender","mp_weapon_mgl","mp_weapon_rspn101_og","mp_weapon_smart_pistol","mp_weapon_yh803","mp_weapon_yh803_bullet","mp_weapon_yh803_bullet_overcharged"]
14+
const array< string > WEAPONS_LIST = ["mp_weapon_rspn101","mp_weapon_mastiff","mp_weapon_r97","mp_weapon_alternator_smg","mp_weapon_car","mp_weapon_hemlok_smg","mp_weapon_lmg","mp_weapon_lstar","mp_weapon_esaw","mp_weapon_vinson","mp_weapon_hemlok","mp_weapon_g2","mp_weapon_shotgun","mp_weapon_smr","mp_weapon_pulse_lmg","mp_weapon_autopistol","mp_weapon_semipistol","mp_weapon_wingman","mp_weapon_rocket_launcher","mp_weapon_arc_launcher","mp_weapon_defender","mp_weapon_mgl","mp_weapon_rspn101_og","mp_weapon_smart_pistol","mp_weapon_yh803","mp_weapon_yh803_bullet","mp_weapon_yh803_bullet_overcharged"]
1515

1616
//============================|EDITABLE VARIABLES END|============================//
1717

‎mod/scripts/vscripts/gamemodes/_gamemode_ps.nut

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ const string DEFAULT_WEAPON_PRIMARY = "mp_weapon_wingman_n"
1111
const string DEFAULT_WEAPON_SECONDARY = "mp_weapon_softball"
1212
const string DEFAULT_WEAPON_BACKUP = "mp_weapon_arena3"
1313

14-
const array< string > WEAPONS_LIST = ["mp_weapon_rspn101","mp_weapon_mastiff","mp_weapon_r97","mp_weapon_alternator_smg","mp_weapon_car","mp_weapon_hemlok_smg","mp_weapon_lmg","mp_weapon_lstar","mp_weapon_esaw","mp_weapon_vinson","mp_weapon_hemlok","mp_weapon_g2","mp_weapon_shotgun","mp_weapon_smr","mp_weapon_pulse_lmg","mp_weapon_autopistol","mp_weapon_semipistol","mp_weapon_wingman","mp_weapon_shotgun_pistol","mp_weapon_rocket_launcher","mp_weapon_arc_launcher","mp_weapon_defender","mp_weapon_mgl","mp_weapon_rspn101_og","mp_weapon_smart_pistol","mp_weapon_yh803","mp_weapon_yh803_bullet","mp_weapon_yh803_bullet_overcharged"]
14+
const array< string > WEAPONS_LIST = ["mp_weapon_rspn101","mp_weapon_mastiff","mp_weapon_r97","mp_weapon_alternator_smg","mp_weapon_car","mp_weapon_hemlok_smg","mp_weapon_lmg","mp_weapon_lstar","mp_weapon_esaw","mp_weapon_vinson","mp_weapon_hemlok","mp_weapon_g2","mp_weapon_shotgun","mp_weapon_smr","mp_weapon_pulse_lmg","mp_weapon_autopistol","mp_weapon_semipistol","mp_weapon_wingman","mp_weapon_rocket_launcher","mp_weapon_arc_launcher","mp_weapon_defender","mp_weapon_mgl","mp_weapon_rspn101_og","mp_weapon_smart_pistol","mp_weapon_yh803","mp_weapon_yh803_bullet","mp_weapon_yh803_bullet_overcharged"]
1515

1616
//============================|EDITABLE VARIABLES END|============================//
1717

0 commit comments

Comments
 (0)