diff --git a/.Stuff for developers/Temp workfolder delete later/Charm.qc b/.Stuff for developers/Temp workfolder delete later/Charm.qc index 6aaf0e49..45e52af9 100644 --- a/.Stuff for developers/Temp workfolder delete later/Charm.qc +++ b/.Stuff for developers/Temp workfolder delete later/Charm.qc @@ -32,11 +32,11 @@ $jigglebone "ring1" is_rigid { length 20 - tip_mass 1111 + tip_mass 555 yaw_constraint -70 70 - yaw_friction 5 + yaw_friction 1 pitch_constraint 0 70 - pitch_friction 5 + pitch_friction 1 // angle_constraint 90 // angle_constraint 60 // pitch_stiffness 100 @@ -48,51 +48,51 @@ $jigglebone "ring1" // angle_constraint 15 } } -// $jigglebone "chain1" -// { -// is_flexible -// { -// length 20 -// tip_mass 20 -// pitch_stiffness 100 -// pitch_damping 2 -// yaw_stiffness 100 -// yaw_damping 3 -// along_stiffness 100 -// along_damping 0 -// angle_constraint 15 -// } -// } -// $jigglebone "chain3" -// { -// is_flexible -// { -// length 20 -// tip_mass 20 -// pitch_stiffness 100 -// pitch_damping 2 -// yaw_stiffness 100 -// yaw_damping 3 -// along_stiffness 100 -// along_damping 0 -// angle_constraint 15 -// } -// } -// $jigglebone "ring3" -// { -// is_flexible -// { -// length 20 -// tip_mass 20 -// pitch_stiffness 100 -// pitch_damping 2 -// yaw_stiffness 100 -// yaw_damping 3 -// along_stiffness 100 -// along_damping 0 -// angle_constraint 15 -// } -// } +$jigglebone "chain1" +{ + is_flexible + { + length 20 + tip_mass 122 + pitch_stiffness 100 + pitch_damping 2 + yaw_stiffness 100 + yaw_damping 3 + along_stiffness 100 + along_damping 0 + angle_constraint 15 + } +} +$jigglebone "chain3" +{ + is_flexible + { + length 20 + tip_mass 122 + pitch_stiffness 100 + pitch_damping 2 + yaw_stiffness 100 + yaw_damping 3 + along_stiffness 100 + along_damping 0 + angle_constraint 15 + } +} +$jigglebone "ring3" +{ + is_flexible + { + length 20 + tip_mass 666 + pitch_stiffness 100 + pitch_damping 2 + yaw_stiffness 100 + yaw_damping 3 + along_stiffness 100 + along_damping 0 + angle_constraint 15 + } +} $attachment "Charm" "ring3" 0.00 0.00 0.12 rotate 0 -70 90 diff --git a/lua/weapons/arc9_base/cl_customize_ui_bottombar.lua b/lua/weapons/arc9_base/cl_customize_ui_bottombar.lua index 46b69cc2..05fd6600 100644 --- a/lua/weapons/arc9_base/cl_customize_ui_bottombar.lua +++ b/lua/weapons/arc9_base/cl_customize_ui_bottombar.lua @@ -192,7 +192,7 @@ local function enterfolder(self, scroll, slottbl, fname) enterfolder(self, scroll, slottbl, self2.folder) surface.PlaySound(foldersound) end - if kc == MOUSE_RIGHT then + if kc == MOUSE_RIGHT then -- randomizing attachments from folder! local randompool = {} for _, v in ipairs(self.BottomBarAtts) do @@ -221,8 +221,7 @@ local function enterfolder(self, scroll, slottbl, fname) if !IsValid(self) then return end if self2:IsHovered() then self.CustomizeHints["customize.hint.select"] = "customize.hint.select" - -- self.CustomizeHints["customize.hint.deselect"] = "customize.hint.randomize" - self.CustomizeHints["customize.hint.deselect"] = "customize.hint.randomize" + self.CustomizeHints["customize.hint.deselect"] = "customize.hint.randomize" end end end diff --git a/models/items/arc9/att_charmbase.dx80.vtx b/models/items/arc9/att_charmbase.dx80.vtx index daa062cb..50ba1dde 100644 Binary files a/models/items/arc9/att_charmbase.dx80.vtx and b/models/items/arc9/att_charmbase.dx80.vtx differ diff --git a/models/items/arc9/att_charmbase.dx90.vtx b/models/items/arc9/att_charmbase.dx90.vtx index 03c0f78f..0c76d7d4 100644 Binary files a/models/items/arc9/att_charmbase.dx90.vtx and b/models/items/arc9/att_charmbase.dx90.vtx differ diff --git a/models/items/arc9/att_charmbase.mdl b/models/items/arc9/att_charmbase.mdl index 671dce77..43c7fa15 100644 Binary files a/models/items/arc9/att_charmbase.mdl and b/models/items/arc9/att_charmbase.mdl differ diff --git a/models/items/arc9/att_charmbase.sw.vtx b/models/items/arc9/att_charmbase.sw.vtx index 3a177b9f..95e92484 100644 Binary files a/models/items/arc9/att_charmbase.sw.vtx and b/models/items/arc9/att_charmbase.sw.vtx differ diff --git a/models/items/arc9/att_charmbase.vvd b/models/items/arc9/att_charmbase.vvd index 8fd3a918..7249bbe6 100644 Binary files a/models/items/arc9/att_charmbase.vvd and b/models/items/arc9/att_charmbase.vvd differ