Skip to content

Commit

Permalink
Fixes and stuff
Browse files Browse the repository at this point in the history
As listed on #39 - fixed three things:

- Fixed that the Dual Sawed-Off did not have camouflages applied to its model
- Fixed that the 20-round magazine on the MP9 applied a magazine size multiplier of 0.7 rather than a magazine size override of 20
- Fixed that the 12-round .45 UMP magazine on the UMP-45 provided a mag size penalty of 15 rather than 12

- Also altered the ADS recoil on the AWP
  • Loading branch information
MokaAkashiya85 committed Jun 24, 2023
1 parent 7757a1d commit 8127a75
Show file tree
Hide file tree
Showing 6 changed files with 65 additions and 17 deletions.
3 changes: 2 additions & 1 deletion lua/arc9/common/attachments_bulk/csgo_arc9_weapon_mp9.lua
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,8 @@ ATT.SortOrder = 2
ATT.Free = false

ATT.Category = {"go_mag_mp9"}
ATT.ClipSizeMult = 0.7
-- ATT.ClipSizeMult = 0.7
ATT.ClipSizeOverride = 20
ATT.ReloadTimeMult = 0.85

ATT.ActivateElements = {"mag_decreased"}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ ATT.Free = false

ATT.Category = {"go_ump_mag"}
ATT.ActivateElements = {"mag_15"}
ATT.ClipSizeOverride = 15
ATT.ClipSizeOverride = 12
ATT.ReloadTimeMult = 0.8
ATT.AimDownSightsTimeMult = 0.85
ATT.SprintToFireTimeMult = 0.85
Expand Down
28 changes: 14 additions & 14 deletions lua/weapons/arc9_go_akimbo_mp9.lua
Original file line number Diff line number Diff line change
Expand Up @@ -511,20 +511,20 @@ SWEP.Attachments = {
},
Scale = 1,
},
{
PrintName = ARC9:GetPhrase("csgo_category_optics"),
Bone = "tag_pistol_attachments",
Pos = Vector(0, 0, 2),
Ang = Angle(0, 0, 0),
Category = {"csgo_optic",},
CorrectiveAng = Angle(0.03, 0.1, 0.5),
DuplicateModels = {
{
Bone = "tag_pistol_attachments_l",
}
},
Scale = 0.9,
},
-- {
-- PrintName = ARC9:GetPhrase("csgo_category_optics"),
-- Bone = "tag_pistol_attachments",
-- Pos = Vector(0, 0, 2),
-- Ang = Angle(0, 0, 0),
-- Category = {"csgo_optic",},
-- CorrectiveAng = Angle(0.03, 0.1, 0.5),
-- DuplicateModels = {
-- {
-- Bone = "tag_pistol_attachments_l",
-- }
-- },
-- Scale = 0.9,
-- },
{
PrintName = ARC9:GetPhrase("csgo_category_tactical"),
DefaultAttName = "Default",
Expand Down
2 changes: 1 addition & 1 deletion lua/weapons/arc9_go_awp.lua
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ SWEP.RecoilKick = 1.5

SWEP.RecoilMultCrouch = 0.8
SWEP.RecoilMultHipFire = .25
SWEP.RecoilMultSights = .1
SWEP.RecoilMultSights = 1
SWEP.RecoilAutoControlMultHipFire = .5

SWEP.UseVisualRecoil = true
Expand Down
8 changes: 8 additions & 0 deletions materials/models/csgo/sawedoff/shot_sawedoff_01.vmt
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,15 @@
"$rimmask" "1"
"$nocull" "1"

"$detailblendmode" "4"
"$detailblendfactor" "1"

Proxies {
CustomCamo {
camoTexture $detail
camoScale $detailscale
blend $detailblendfactor
}
"Arc9EnvMapTint"
{
"specularity" "0.5"
Expand Down
39 changes: 39 additions & 0 deletions materials/models/csgo/sawedoff/shot_sawedoff_01_skin.vmt
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
"VertexlitGeneric"
{
"$basetexture" "models/csgo/sawedoff/shot_sawedoff_02"
"$bumpmap" "models/csgo/sawedoff/shot_sawedoff_01_n"
"$phongexponenttexture" "models/csgo/sawedoff/shot_sawedoff_01_exponent"
"$color2" "[0.8 0.8 0.8]"
"$blendTintByBaseAlpha" "1"

"$envmap" "env_cubemap"
"$envmaptint" "[ .13 .13 .13 ]"

"$phong" "1"
"$phongboost" "5"
"$phongfresnelranges" "[0.25 0.5 1]"
"$normalmapalphaenvmapmask" "1"
//"$phongwarptexture" "models\weapons\v_arccw_go\atts\steelwarp"

"$rimlight" "0"
"$rimlightexponent" "80"
"$rimlightboost" ".2"
"$rimmask" "1"
"$nocull" "1"

Proxies {
"Arc9EnvMapTint"
{
"specularity" "0.5"
"min" "0"
"max" "0.3"
}
}
}







0 comments on commit 8127a75

Please sign in to comment.