фыв

2025-06-29 12:22:15 +03:00
parent 037ef1b6a3
commit eaeb0c45ac
21 changed files with 952 additions and 63 deletions
--- a/Assets/Items/Cloth/3dglasses.clitem
+++ b/Assets/Items/Cloth/3dglasses.clitem
@@ -3,7 +3,6 @@
  "Slot": "Head",
  "ArmorValue": 0,
  "IsVisible": true,
-  "BodyPart": "",
  "Category": "Clothing",
  "Name": "3D Glasses",
  "Description": "3dglasses",
@@ -16,7 +15,7 @@
  "MaxCount": 1,
  "Rarity": "Common",
  "Weight": 1,
-  "IsStackable": false,
+  "IsStackable": true,
  "IsEquipable": true,
  "__references": [],
  "__version": 0
--- a/Assets/Items/Cloth/aviatorsunglasses.clitem
+++ b/Assets/Items/Cloth/aviatorsunglasses.clitem
@@ -3,7 +3,6 @@
  "Slot": "Head",
  "ArmorValue": 0,
  "IsVisible": true,
-  "BodyPart": "",
  "Category": "Clothing",
  "Name": "Aviator Sunglasses",
  "Description": "aviatorsunglasses",
@@ -16,7 +15,7 @@
  "MaxCount": 1,
  "Rarity": "Common",
  "Weight": 1,
-  "IsStackable": false,
+  "IsStackable": true,
  "IsEquipable": true,
  "__references": [],
  "__version": 0
--- a/Assets/Items/Cloth/balaclavanoholesblack.clitem
+++ b/Assets/Items/Cloth/balaclavanoholesblack.clitem
@@ -3,7 +3,6 @@
  "Slot": "Head",
  "ArmorValue": 0,
  "IsVisible": true,
-  "BodyPart": "",
  "Category": "Clothing",
  "Name": "Balaclava Noholes Black",
  "Description": "balaclavanoholesblack",
@@ -16,7 +15,7 @@
  "MaxCount": 1,
  "Rarity": "Common",
  "Weight": 1,
-  "IsStackable": false,
+  "IsStackable": true,
  "IsEquipable": true,
  "__references": [],
  "__version": 0
--- a/Assets/Items/Cloth/bunnyears.clitem
+++ b/Assets/Items/Cloth/bunnyears.clitem
@@ -3,7 +3,6 @@
  "Slot": "Head",
  "ArmorValue": 0,
  "IsVisible": true,
-  "BodyPart": "",
  "Category": "Clothing",
  "Name": "Bunny Ears",
  "Description": "bunnyears",
@@ -16,7 +15,7 @@
  "MaxCount": 1,
  "Rarity": "Common",
  "Weight": 1,
-  "IsStackable": false,
+  "IsStackable": true,
  "IsEquipable": true,
  "__references": [],
  "__version": 0
--- a/Assets/Items/Cloth/devilhorns.clitem
+++ b/Assets/Items/Cloth/devilhorns.clitem
@@ -3,7 +3,6 @@
  "Slot": "Head",
  "ArmorValue": 0,
  "IsVisible": true,
-  "BodyPart": "",
  "Category": "Clothing",
  "Name": "Devil Horns",
  "Description": "devilhorns",
@@ -16,7 +15,7 @@
  "MaxCount": 1,
  "Rarity": "Common",
  "Weight": 1,
-  "IsStackable": false,
+  "IsStackable": true,
  "IsEquipable": true,
  "__references": [],
  "__version": 0
--- a/Assets/Items/Cloth/devilwings.clitem
+++ b/Assets/Items/Cloth/devilwings.clitem
@@ -1,6 +1,9 @@
 {
  "ClothUrl": "zedskipper/devilwings",
  "Slot": "Body",
+  "ArmorValue": 0,
+  "IsVisible": true,
+  "Category": "Clothing",
  "Name": "Devil Wings",
  "Description": "devilwings",
  "Prefab": {
@@ -10,6 +13,10 @@
  "ImageTexture": null,
  "ImageUrl": "https://cdn.sbox.game/org/zedskipper/devilwings/thumb/51af0358-cba4-4213-8664-98104900638b.png",
  "MaxCount": 1,
+  "Rarity": "Common",
+  "Weight": 1,
+  "IsStackable": true,
+  "IsEquipable": true,
  "__references": [],
  "__version": 0
 }
--- a/Assets/Items/Cloth/hockeymask.clitem
+++ b/Assets/Items/Cloth/hockeymask.clitem
@@ -3,7 +3,6 @@
  "Slot": "Head",
  "ArmorValue": 0,
  "IsVisible": true,
-  "BodyPart": "",
  "Category": "Clothing",
  "Name": "Hockey Mask",
  "Description": "hockeymask",
@@ -16,7 +15,7 @@
  "MaxCount": 1,
  "Rarity": "Common",
  "Weight": 1,
-  "IsStackable": false,
+  "IsStackable": true,
  "IsEquipable": true,
  "__references": [],
  "__version": 0
--- a/Assets/Items/Cloth/jetpack.clitem
+++ b/Assets/Items/Cloth/jetpack.clitem
@@ -1,6 +1,9 @@
 {
  "ClothUrl": "bitropy/jetpack",
  "Slot": "Body",
+  "ArmorValue": 0,
+  "IsVisible": true,
+  "Category": "Clothing",
  "Name": "Jetpack",
  "Description": "jetpack",
  "Prefab": {
@@ -10,6 +13,10 @@
  "ImageTexture": null,
  "ImageUrl": "https://cdn.sbox.game/asset/bitropy.jetpack/thumb.png.d0b1def606dfc2b7",
  "MaxCount": 1,
+  "Rarity": "Common",
+  "Weight": 1,
+  "IsStackable": true,
+  "IsEquipable": true,
  "__references": [],
  "__version": 0
 }
--- a/Assets/Items/Cloth/nvg.clitem
+++ b/Assets/Items/Cloth/nvg.clitem
@@ -3,7 +3,6 @@
  "Slot": "Head",
  "ArmorValue": 0,
  "IsVisible": true,
-  "BodyPart": "",
  "Category": "Clothing",
  "Name": "Night-vision Goggles",
  "Description": "nvg",
@@ -16,7 +15,7 @@
  "MaxCount": 1,
  "Rarity": "Common",
  "Weight": 1,
-  "IsStackable": false,
+  "IsStackable": true,
  "IsEquipable": true,
  "__references": [],
  "__version": 0
--- a/Assets/Items/Cloth/poncho2.clitem
+++ b/Assets/Items/Cloth/poncho2.clitem
@@ -1,6 +1,9 @@
 {
  "ClothUrl": "edgyvoxel/poncho2",
  "Slot": "Body",
+  "ArmorValue": 0,
+  "IsVisible": true,
+  "Category": "Clothing",
  "Name": "Western Poncho",
  "Description": "poncho2",
  "Prefab": {
@@ -10,6 +13,10 @@
  "ImageTexture": null,
  "ImageUrl": "https://cdn.sbox.game/org/edgyvoxel/poncho2/thumb/326c9f9b-6b35-478b-b617-f50318173df3.png",
  "MaxCount": 1,
+  "Rarity": "Common",
+  "Weight": 1,
+  "IsStackable": true,
+  "IsEquipable": true,
  "__references": [],
  "__version": 0
 }
--- a/Assets/Items/Cloth/sfsocks.clitem
+++ b/Assets/Items/Cloth/sfsocks.clitem
@@ -3,7 +3,6 @@
  "Slot": "Bottom",
  "ArmorValue": 0,
  "IsVisible": true,
-  "BodyPart": "",
  "Category": "Clothing",
  "Name": "Smallfish Socks",
  "Description": "sfsocks",
@@ -16,7 +15,7 @@
  "MaxCount": 1,
  "Rarity": "Common",
  "Weight": 1,
-  "IsStackable": false,
+  "IsStackable": true,
  "IsEquipable": true,
  "__references": [],
  "__version": 0
--- a/Assets/Items/Cloth/sleepmask.clitem
+++ b/Assets/Items/Cloth/sleepmask.clitem
@@ -15,6 +15,7 @@
  "MaxCount": 1,
  "Rarity": "Common",
  "Weight": 1,
+  "IsStackable": true,
  "IsEquipable": true,
  "__references": [],
  "__version": 0
--- a/Assets/Items/Cloth/snowgoggles.clitem
+++ b/Assets/Items/Cloth/snowgoggles.clitem
@@ -15,6 +15,7 @@
  "MaxCount": 1,
  "Rarity": "Common",
  "Weight": 1,
+  "IsStackable": true,
  "IsEquipable": true,
  "__references": [],
  "__version": 0
--- a/Assets/Items/Cloth/thugglasses.clitem
+++ b/Assets/Items/Cloth/thugglasses.clitem
@@ -15,6 +15,7 @@
  "MaxCount": 1,
  "Rarity": "Common",
  "Weight": 1,
+  "IsStackable": true,
  "IsEquipable": true,
  "__references": [],
  "__version": 0
--- a/Assets/Items/Cloth/weldinggogglesvisorup.clitem
+++ b/Assets/Items/Cloth/weldinggogglesvisorup.clitem
@@ -15,6 +15,7 @@
  "MaxCount": 1,
  "Rarity": "Common",
  "Weight": 1,
+  "IsStackable": true,
  "IsEquipable": true,
  "__references": [],
  "__version": 0
--- a/Assets/Items/money.inv
+++ b/Assets/Items/money.inv
@@ -0,0 +1,17 @@
+{
+  "Name": "Money",
+  "Description": "",
+  "Prefab": {
+    "_type": "gameobject",
+    "prefab": "prefabs/money.prefab"
+  },
+  "ImageTexture": null,
+  "ImageUrl": null,
+  "MaxCount": 1000,
+  "Category": "Misc",
+  "Rarity": "Common",
+  "Weight": 0,
+  "IsEquipable": false,
+  "__references": [],
+  "__version": 0
+}
--- a/Assets/Items/pistol_test.weapon
+++ b/Assets/Items/pistol_test.weapon
@@ -3,7 +3,7 @@
  "HoldType": "Pistol",
  "WeaponDefinition": {
    "Position": "-1.108,0.38,-2.367",
-    "Rotation": "0.002790701,0.01173679,0.006057173,0.9999089",
+    "Rotation": "0.004714465,-0.05182558,0.03585436,0.9980012",
    "Scale": "1,1,1"
  },
  "Damage": 10,
@@ -26,7 +26,6 @@
  "MaxCount": 1,
  "Rarity": "Common",
  "Weight": 1,
-  "IsStackable": false,
  "IsEquipable": true,
  "__references": [],
  "__version": 0