From efe396f0876ba7a5b7a48e4dc8a99afbb4bc6116 Mon Sep 17 00:00:00 2001 From: Darsu <95997959+dar-su@users.noreply.github.com> Date: Sun, 8 Oct 2023 19:47:19 +0700 Subject: [PATCH] less stiff charms (someone forgot to uncomment everything in qc) --- .../Temp workfolder delete later/Charm.qc | 96 +++++++++--------- .../arc9_base/cl_customize_ui_bottombar.lua | 5 +- models/items/arc9/att_charmbase.dx80.vtx | Bin 67046 -> 67046 bytes models/items/arc9/att_charmbase.dx90.vtx | Bin 67046 -> 67046 bytes models/items/arc9/att_charmbase.mdl | Bin 3988 -> 4196 bytes models/items/arc9/att_charmbase.sw.vtx | Bin 66990 -> 66990 bytes models/items/arc9/att_charmbase.vvd | Bin 297280 -> 297280 bytes 7 files changed, 50 insertions(+), 51 deletions(-) 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 daa062cb9db5792ebe1641d9a65fcdb08e4a6d43..50ba1dde7ee42f3800811181cfaf4faddc37cdef 100644 GIT binary patch delta 34 mcmaFX&GM|9MTDJ!fk6U@1sFIPn1OVLb>`njk*y+(mskOSp9gsW delta 34 mcmaFX&GM|9MTDJ!fk6U@1sFIPn1Qq?Qz?6+$W{@?ORNBMkOl() diff --git a/models/items/arc9/att_charmbase.dx90.vtx b/models/items/arc9/att_charmbase.dx90.vtx index 03c0f78ff61c2488e9196e3203bf0350e23791fc..0c76d7d49a88f364b608fef7d4a89f120fbe702d 100644 GIT binary patch delta 34 mcmaFX&GM|9MTDJ!fk6U@O&K^Dn1OVLb>`njk*y+(mskOVUI(54 delta 34 mcmaFX&GM|9MTDJ!fk6U@O&K^Dn1Qq?Qz?6+$W{@?ORNBPPX;Ie diff --git a/models/items/arc9/att_charmbase.mdl b/models/items/arc9/att_charmbase.mdl index 671dce77a241f406caafbcbe6a541097a919c02a..43c7fa159149e337c82b95276fee989203ded414 100644 GIT binary patch delta 711 zcma)3%PT}-6hHSlcjgW*<+WiZnqivMl$|m|N-Qjlg(y*zNBILZYFyET4dYN23M(av z#vfp5VZlbTv`{RF1+!3$bMD;hv5{Y$@0{=a&hz^=>TiACp04;n1OO)6rrtB&n3ym! zeM57G8$clMw5?5B*LcWjgL$8~7&mHb_9bjv(~BI}V(^`Xarn3H{uPifqw%PygJQB7 zP72vSD_+uC9i@08+_{JuF9E1)o(7&%`BV zgq#9JG{`&D?u%ZN)|50a%#?OvuWZp1az;2pzZ?|a(68*2%PN4vQ%HOOT;r7z)S9U^ zJFJvdNyB<|S^41Swki&iB|G$!I$!BjIk#5{IH7tA7lqvpIP+lE6|69$mV=Iiv2C)= zC_cDaoA|S>FnH+%I46n4iW(dZ>z;HwwGUw475Yvv16}_~5bDsc4cD&Fx(w@cBw18w zU^8DRoZ_aoP$B!6GXPSPy=>jTW_#V!f;y8lCT5e=yAf|ZVQH}>g=KnN%z4Qb7W)ib Q*ZbZ420$WbAN76d6D`Df6#xJL delta 602 zcmaJ-%`3xk7=OOMxBX^6Z4~0NEo&>S)#M-trj&7zycJGdCP{X1u;eAF&4I0FX$OUq z;xbKALjD3NN8zAclp7b!^K8Fgaq+3|_j&nzo|m3yPu6YpbPW!L0iZ^jw`GiolyzqM z#+E%gfS~N6Y15{S+9_#*`F=-Pmo_cuvZmi!QRcW8gJXV-`~PkCAA#QqkfWv+%Ec=k zJdD9hFm%!}tT?G>!nIA-C}wh23H!e~0<9CT#AETI5VMVO*^gIJN^GK62`D$D#C@p_ z^OA~bIjx>jLXf&q|D;0hS)yY~Mm*rH8W2tBRd+F`xrD~CK1yekE!mc=qgzXf5U$z+ zdXlcgLrWdrv{kNBNBG=4z!4$}V6PLNHn3m|RPRMf3HlBvb~=cO;H#}gv}2Why#7!t zlLi}EkyKi3?xR?|!*%;wv+S*g=+vD5d*LfO5}NkCw<#W0x&W4@dQ}e>k>5N!%pSnm wd!eCXMrh{=SL`xD+xRf=2+AkMH9k59r6YqfMN09L+hKmY&$ diff --git a/models/items/arc9/att_charmbase.sw.vtx b/models/items/arc9/att_charmbase.sw.vtx index 3a177b9f3a622dd05cdd729d42cc4c4e667f24b1..95e9248425aefec7a8293278d7091c01879df75e 100644 GIT binary patch delta 34 kcmZ42&9bhWMTDIJ2$(>alYtpXWmsqaZ4}um!Z?c+0B-LFtpET3 delta 34 kcmZ42&9bhWMTDIJ2$(>alYtpXi87V4H;QZ(VVuPZ0Ab(-Hvj+t diff --git a/models/items/arc9/att_charmbase.vvd b/models/items/arc9/att_charmbase.vvd index 8fd3a918b33f17af67c3cf7a062f84e6a5fe3151..7249bbe6890d180ec69c06034fbb57afcf913632 100644 GIT binary patch delta 35 qcmX>wN$9{NAs$bc;4l^j28Iml%)gC1tvrmaJWQ=T%v*U_OgaI=f(hUN delta 35 qcmX>wN$9{NAs$bc;4l^j1_n{4QuaokRvyMy9;Q|v=B+#|CY=DNO$cfL