From 793165bb0316404edf95908881926fa8df27d8c0 Mon Sep 17 00:00:00 2001 From: Oscar Date: Thu, 26 Jun 2025 21:12:11 +0300 Subject: [PATCH] upd --- Assets/Items/Cloth/3dglasses.clitem | 2 +- Assets/Items/Cloth/arrowthroughhead.clitem | 2 +- Assets/Items/Cloth/aviatorsunglasses.clitem | 2 +- Assets/Items/Cloth/axolotlhat.clitem | 2 +- .../Items/Cloth/balaclavanoholesblack.clitem | 2 +- Assets/Items/Cloth/ballisticmaskv1.clitem | 2 +- Assets/Items/Cloth/bunnyears.clitem | 2 +- .../Cloth/classicbasketballsneakers.clitem | 2 +- Assets/Items/Cloth/cleaningglovesv1.clitem | 2 +- Assets/Items/Cloth/cleaningglovesv2.clitem | 2 +- Assets/Items/Cloth/cyberpunkglasses.clitem | 2 +- Assets/Items/Cloth/denimshorts.clitem | 2 +- Assets/Items/Cloth/devilhorns.clitem | 2 +- Assets/Items/Cloth/devilwings.clitem | 2 +- Assets/Items/Cloth/doubletophat.clitem | 2 +- Assets/Items/Cloth/duckhat.clitem | 2 +- .../Items/Cloth/firefighter_helmet_top.clitem | 2 +- Assets/Items/Cloth/fluffyslippers.clitem | 2 +- Assets/Items/Cloth/froghatv1.clitem | 2 +- Assets/Items/Cloth/goathorns.clitem | 2 +- Assets/Items/Cloth/hatjester.clitem | 2 +- Assets/Items/Cloth/hockeymask.clitem | 2 +- Assets/Items/Cloth/homberg_hat.clitem | 2 +- Assets/Items/Cloth/imwithterrytshirt.clitem | 2 +- Assets/Items/Cloth/jetpack.clitem | 2 +- Assets/Items/Cloth/jussipaitajumper.clitem | 2 +- Assets/Items/Cloth/looseblackpants.clitem | 2 +- Assets/Items/Cloth/loosebrownpants.clitem | 2 +- Assets/Items/Cloth/melonhelmet.clitem | 2 +- Assets/Items/Cloth/nvg.clitem | 2 +- Assets/Items/Cloth/paperbag.clitem | 2 +- Assets/Items/Cloth/piratehat.clitem | 2 +- Assets/Items/Cloth/poncho2.clitem | 2 +- Assets/Items/Cloth/propanetankhelm.clitem | 2 +- Assets/Items/Cloth/propellerhat.clitem | 2 +- Assets/Items/Cloth/pyjamabottoms.clitem | 2 +- Assets/Items/Cloth/pyjamatop.clitem | 2 +- Assets/Items/Cloth/rangerhelmet.clitem | 2 +- Assets/Items/Cloth/reapersuit.clitem | 2 +- .../Items/Cloth/retrotechracerhelmet.clitem | 2 +- Assets/Items/Cloth/safetyglasses.clitem | 2 +- Assets/Items/Cloth/sfsocks.clitem | 2 +- Assets/Items/Cloth/sharkhead.clitem | 2 +- Assets/Items/Cloth/skibidilid.clitem | 2 +- Assets/Items/Cloth/skihelmet.clitem | 2 +- Assets/Items/Cloth/skihelmetgreen.clitem | 2 +- Assets/Items/Cloth/sleepmask.clitem | 2 +- Assets/Items/Cloth/snowgoggles.clitem | 2 +- Assets/Items/Cloth/snowmitten.clitem | 2 +- Assets/Items/Cloth/striped_jumper.clitem | 2 +- .../Cloth/sunglasseswithanimatedlenses.clitem | 2 +- Assets/Items/Cloth/teashades.clitem | 2 +- Assets/Items/Cloth/thugglasses.clitem | 2 +- Assets/Items/Cloth/tracktop.clitem | 2 +- Assets/Items/Cloth/trafficcone.clitem | 2 +- Assets/Items/Cloth/varsityjacket.clitem | 2 +- .../Items/Cloth/weldinggogglesvisorup.clitem | 2 +- Assets/Items/Cloth/whitetanktop.clitem | 2 +- Assets/Items/Cloth/whitetanktopspoiled.clitem | 2 +- Assets/Items/Cloth/wizardhat.clitem | 2 +- Assets/Items/Cloth/xvioutfit.clitem | 2 +- Assets/scenes/test.scene | 2 +- Code/Player/Dedugan.Inventory.cs | 2 +- Code/Player/Dedugan.Player.cs | 7 ++- Code/WorlModelClothSpawner.cs | 47 +++++++------------ Editor/UpdateCloths.cs | 4 +- 66 files changed, 89 insertions(+), 95 deletions(-) diff --git a/Assets/Items/Cloth/3dglasses.clitem b/Assets/Items/Cloth/3dglasses.clitem index 0490428..a404882 100644 --- a/Assets/Items/Cloth/3dglasses.clitem +++ b/Assets/Items/Cloth/3dglasses.clitem @@ -2,7 +2,7 @@ "ClothUrl": "bugulma/3dglasses", "Slot": "Body", "Name": "3D Glasses", - "Description": null, + "Description": "3dglasses", "Prefab": { "_type": "gameobject", "prefab": "prefabs/item_parcel.prefab" diff --git a/Assets/Items/Cloth/arrowthroughhead.clitem b/Assets/Items/Cloth/arrowthroughhead.clitem index 65cce14..0a19094 100644 --- a/Assets/Items/Cloth/arrowthroughhead.clitem +++ b/Assets/Items/Cloth/arrowthroughhead.clitem @@ -2,7 +2,7 @@ "ClothUrl": "microfivetwotwo/arrowthroughhead", "Slot": "Body", "Name": "Arrow through head", - "Description": null, + "Description": "arrowthroughhead", "Prefab": { "_type": "gameobject", "prefab": "prefabs/item_parcel.prefab" diff --git a/Assets/Items/Cloth/aviatorsunglasses.clitem b/Assets/Items/Cloth/aviatorsunglasses.clitem index 2fb4fe7..f78a2de 100644 --- a/Assets/Items/Cloth/aviatorsunglasses.clitem +++ b/Assets/Items/Cloth/aviatorsunglasses.clitem @@ -2,7 +2,7 @@ "ClothUrl": "bugulma/aviatorsunglasses", "Slot": "Body", "Name": "Aviator Sunglasses", - "Description": null, + "Description": "aviatorsunglasses", "Prefab": { "_type": "gameobject", "prefab": "prefabs/item_parcel.prefab" diff --git a/Assets/Items/Cloth/axolotlhat.clitem b/Assets/Items/Cloth/axolotlhat.clitem index 0ef0e38..ed1796d 100644 --- a/Assets/Items/Cloth/axolotlhat.clitem +++ b/Assets/Items/Cloth/axolotlhat.clitem @@ -2,7 +2,7 @@ "ClothUrl": "gbonn/axolotlhat", "Slot": "Body", "Name": "Axolotl Hat", - "Description": null, + "Description": "axolotlhat", "Prefab": { "_type": "gameobject", "prefab": "prefabs/item_parcel.prefab" diff --git a/Assets/Items/Cloth/balaclavanoholesblack.clitem b/Assets/Items/Cloth/balaclavanoholesblack.clitem index 3b63002..6e54068 100644 --- a/Assets/Items/Cloth/balaclavanoholesblack.clitem +++ b/Assets/Items/Cloth/balaclavanoholesblack.clitem @@ -2,7 +2,7 @@ "ClothUrl": "ducksworkshop/balaclavanoholesblack", "Slot": "Body", "Name": "Balaclava Noholes Black", - "Description": null, + "Description": "balaclavanoholesblack", "Prefab": { "_type": "gameobject", "prefab": "prefabs/item_parcel.prefab" diff --git a/Assets/Items/Cloth/ballisticmaskv1.clitem b/Assets/Items/Cloth/ballisticmaskv1.clitem index 93c119f..00a7edf 100644 --- a/Assets/Items/Cloth/ballisticmaskv1.clitem +++ b/Assets/Items/Cloth/ballisticmaskv1.clitem @@ -2,7 +2,7 @@ "ClothUrl": "ducksworkshop/ballisticmaskv1", "Slot": "Body", "Name": "Ballistic Mask - Slightly Worn", - "Description": null, + "Description": "ballisticmaskv1", "Prefab": { "_type": "gameobject", "prefab": "prefabs/item_parcel.prefab" diff --git a/Assets/Items/Cloth/bunnyears.clitem b/Assets/Items/Cloth/bunnyears.clitem index 2c824cd..6e8ae3a 100644 --- a/Assets/Items/Cloth/bunnyears.clitem +++ b/Assets/Items/Cloth/bunnyears.clitem @@ -2,7 +2,7 @@ "ClothUrl": "neil/bunnyears", "Slot": "Body", "Name": "Bunny Ears", - "Description": null, + "Description": "bunnyears", "Prefab": { "_type": "gameobject", "prefab": "prefabs/item_parcel.prefab" diff --git a/Assets/Items/Cloth/classicbasketballsneakers.clitem b/Assets/Items/Cloth/classicbasketballsneakers.clitem index 1e0b6a9..2fce088 100644 --- a/Assets/Items/Cloth/classicbasketballsneakers.clitem +++ b/Assets/Items/Cloth/classicbasketballsneakers.clitem @@ -2,7 +2,7 @@ "ClothUrl": "microfivetwotwo/classicbasketballsneakers", "Slot": "Body", "Name": "Classic Basketball Sneakers", - "Description": null, + "Description": "classicbasketballsneakers", "Prefab": { "_type": "gameobject", "prefab": "prefabs/item_parcel.prefab" diff --git a/Assets/Items/Cloth/cleaningglovesv1.clitem b/Assets/Items/Cloth/cleaningglovesv1.clitem index e5789f8..da30175 100644 --- a/Assets/Items/Cloth/cleaningglovesv1.clitem +++ b/Assets/Items/Cloth/cleaningglovesv1.clitem @@ -2,7 +2,7 @@ "ClothUrl": "ducksworkshop/cleaningglovesv1", "Slot": "Body", "Name": "Cleaning Gloves 2 tone", - "Description": null, + "Description": "cleaningglovesv1", "Prefab": { "_type": "gameobject", "prefab": "prefabs/item_parcel.prefab" diff --git a/Assets/Items/Cloth/cleaningglovesv2.clitem b/Assets/Items/Cloth/cleaningglovesv2.clitem index 3d5684c..1d70692 100644 --- a/Assets/Items/Cloth/cleaningglovesv2.clitem +++ b/Assets/Items/Cloth/cleaningglovesv2.clitem @@ -2,7 +2,7 @@ "ClothUrl": "ducksworkshop/cleaningglovesv2", "Slot": "Body", "Name": "Black Cleaning Gloves", - "Description": null, + "Description": "cleaningglovesv2", "Prefab": { "_type": "gameobject", "prefab": "prefabs/item_parcel.prefab" diff --git a/Assets/Items/Cloth/cyberpunkglasses.clitem b/Assets/Items/Cloth/cyberpunkglasses.clitem index 6327cda..fcb9d4c 100644 --- a/Assets/Items/Cloth/cyberpunkglasses.clitem +++ b/Assets/Items/Cloth/cyberpunkglasses.clitem @@ -2,7 +2,7 @@ "ClothUrl": "jammie/cyberpunkglasses", "Slot": "Body", "Name": "Cyberpunk Glasses", - "Description": null, + "Description": "cyberpunkglasses", "Prefab": { "_type": "gameobject", "prefab": "prefabs/item_parcel.prefab" diff --git a/Assets/Items/Cloth/denimshorts.clitem b/Assets/Items/Cloth/denimshorts.clitem index 349429b..643edfa 100644 --- a/Assets/Items/Cloth/denimshorts.clitem +++ b/Assets/Items/Cloth/denimshorts.clitem @@ -2,7 +2,7 @@ "ClothUrl": "doubletrouble/denimshorts", "Slot": "Body", "Name": "Denim Shorts", - "Description": null, + "Description": "denimshorts", "Prefab": { "_type": "gameobject", "prefab": "prefabs/item_parcel.prefab" diff --git a/Assets/Items/Cloth/devilhorns.clitem b/Assets/Items/Cloth/devilhorns.clitem index bf06f78..b817177 100644 --- a/Assets/Items/Cloth/devilhorns.clitem +++ b/Assets/Items/Cloth/devilhorns.clitem @@ -2,7 +2,7 @@ "ClothUrl": "zedskipper/devilhorns", "Slot": "Body", "Name": "Devil Horns", - "Description": null, + "Description": "devilhorns", "Prefab": { "_type": "gameobject", "prefab": "prefabs/item_parcel.prefab" diff --git a/Assets/Items/Cloth/devilwings.clitem b/Assets/Items/Cloth/devilwings.clitem index f03462f..563dadc 100644 --- a/Assets/Items/Cloth/devilwings.clitem +++ b/Assets/Items/Cloth/devilwings.clitem @@ -2,7 +2,7 @@ "ClothUrl": "zedskipper/devilwings", "Slot": "Body", "Name": "Devil Wings", - "Description": null, + "Description": "devilwings", "Prefab": { "_type": "gameobject", "prefab": "prefabs/item_parcel.prefab" diff --git a/Assets/Items/Cloth/doubletophat.clitem b/Assets/Items/Cloth/doubletophat.clitem index 3a065d5..979594b 100644 --- a/Assets/Items/Cloth/doubletophat.clitem +++ b/Assets/Items/Cloth/doubletophat.clitem @@ -2,7 +2,7 @@ "ClothUrl": "gbonn/doubletophat", "Slot": "Body", "Name": "Double Top Hat", - "Description": null, + "Description": "doubletophat", "Prefab": { "_type": "gameobject", "prefab": "prefabs/item_parcel.prefab" diff --git a/Assets/Items/Cloth/duckhat.clitem b/Assets/Items/Cloth/duckhat.clitem index 8ec70ba..697187e 100644 --- a/Assets/Items/Cloth/duckhat.clitem +++ b/Assets/Items/Cloth/duckhat.clitem @@ -2,7 +2,7 @@ "ClothUrl": "ducksworkshop/duckhat", "Slot": "Body", "Name": "Duck Hat", - "Description": null, + "Description": "duckhat", "Prefab": { "_type": "gameobject", "prefab": "prefabs/item_parcel.prefab" diff --git a/Assets/Items/Cloth/firefighter_helmet_top.clitem b/Assets/Items/Cloth/firefighter_helmet_top.clitem index 3c72c4a..4ff2885 100644 --- a/Assets/Items/Cloth/firefighter_helmet_top.clitem +++ b/Assets/Items/Cloth/firefighter_helmet_top.clitem @@ -2,7 +2,7 @@ "ClothUrl": "zedskipper/firefighter_helmet_top", "Slot": "Body", "Name": "Firefighter Helmet", - "Description": null, + "Description": "firefighterhelmettop", "Prefab": { "_type": "gameobject", "prefab": "prefabs/item_parcel.prefab" diff --git a/Assets/Items/Cloth/fluffyslippers.clitem b/Assets/Items/Cloth/fluffyslippers.clitem index 8668084..c9f761e 100644 --- a/Assets/Items/Cloth/fluffyslippers.clitem +++ b/Assets/Items/Cloth/fluffyslippers.clitem @@ -2,7 +2,7 @@ "ClothUrl": "shadb/fluffyslippers", "Slot": "Body", "Name": "Fluffy Slippers", - "Description": null, + "Description": "fluffyslippers", "Prefab": { "_type": "gameobject", "prefab": "prefabs/item_parcel.prefab" diff --git a/Assets/Items/Cloth/froghatv1.clitem b/Assets/Items/Cloth/froghatv1.clitem index 3970294..c675f48 100644 --- a/Assets/Items/Cloth/froghatv1.clitem +++ b/Assets/Items/Cloth/froghatv1.clitem @@ -2,7 +2,7 @@ "ClothUrl": "ducksworkshop/froghatv1", "Slot": "Body", "Name": "Frog Bucket Hat", - "Description": null, + "Description": "froghatv1", "Prefab": { "_type": "gameobject", "prefab": "prefabs/item_parcel.prefab" diff --git a/Assets/Items/Cloth/goathorns.clitem b/Assets/Items/Cloth/goathorns.clitem index 01febe5..1a5da92 100644 --- a/Assets/Items/Cloth/goathorns.clitem +++ b/Assets/Items/Cloth/goathorns.clitem @@ -2,7 +2,7 @@ "ClothUrl": "stellawisps/goathorns", "Slot": "Body", "Name": "Horns", - "Description": null, + "Description": "goathorns", "Prefab": { "_type": "gameobject", "prefab": "prefabs/item_parcel.prefab" diff --git a/Assets/Items/Cloth/hatjester.clitem b/Assets/Items/Cloth/hatjester.clitem index 2f3eeb6..8ed0908 100644 --- a/Assets/Items/Cloth/hatjester.clitem +++ b/Assets/Items/Cloth/hatjester.clitem @@ -2,7 +2,7 @@ "ClothUrl": "lakrin/hatjester", "Slot": "Body", "Name": "Jester Hat", - "Description": null, + "Description": "hatjester", "Prefab": { "_type": "gameobject", "prefab": "prefabs/item_parcel.prefab" diff --git a/Assets/Items/Cloth/hockeymask.clitem b/Assets/Items/Cloth/hockeymask.clitem index 98e9470..4527171 100644 --- a/Assets/Items/Cloth/hockeymask.clitem +++ b/Assets/Items/Cloth/hockeymask.clitem @@ -2,7 +2,7 @@ "ClothUrl": "doubletrouble/hockeymask", "Slot": "Body", "Name": "Hockey Mask", - "Description": null, + "Description": "hockeymask", "Prefab": { "_type": "gameobject", "prefab": "prefabs/item_parcel.prefab" diff --git a/Assets/Items/Cloth/homberg_hat.clitem b/Assets/Items/Cloth/homberg_hat.clitem index 18346a5..5ee85e6 100644 --- a/Assets/Items/Cloth/homberg_hat.clitem +++ b/Assets/Items/Cloth/homberg_hat.clitem @@ -2,7 +2,7 @@ "ClothUrl": "zontax/homberg_hat", "Slot": "Body", "Name": "Homberg Hat", - "Description": null, + "Description": "homberghat", "Prefab": { "_type": "gameobject", "prefab": "prefabs/item_parcel.prefab" diff --git a/Assets/Items/Cloth/imwithterrytshirt.clitem b/Assets/Items/Cloth/imwithterrytshirt.clitem index 9d493b2..e49e0d1 100644 --- a/Assets/Items/Cloth/imwithterrytshirt.clitem +++ b/Assets/Items/Cloth/imwithterrytshirt.clitem @@ -2,7 +2,7 @@ "ClothUrl": "microfivetwotwo/imwithterrytshirt", "Slot": "Body", "Name": "I\u0027m with Terry T-Shirt", - "Description": null, + "Description": "imwithterrytshirt", "Prefab": { "_type": "gameobject", "prefab": "prefabs/item_parcel.prefab" diff --git a/Assets/Items/Cloth/jetpack.clitem b/Assets/Items/Cloth/jetpack.clitem index fd254d6..21495e9 100644 --- a/Assets/Items/Cloth/jetpack.clitem +++ b/Assets/Items/Cloth/jetpack.clitem @@ -2,7 +2,7 @@ "ClothUrl": "bitropy/jetpack", "Slot": "Body", "Name": "Jetpack", - "Description": null, + "Description": "jetpack", "Prefab": { "_type": "gameobject", "prefab": "prefabs/item_parcel.prefab" diff --git a/Assets/Items/Cloth/jussipaitajumper.clitem b/Assets/Items/Cloth/jussipaitajumper.clitem index 846f842..8ef2a78 100644 --- a/Assets/Items/Cloth/jussipaitajumper.clitem +++ b/Assets/Items/Cloth/jussipaitajumper.clitem @@ -2,7 +2,7 @@ "ClothUrl": "luke/jussipaitajumper", "Slot": "Body", "Name": "Jussipaita Jumper", - "Description": null, + "Description": "jussipaitajumper", "Prefab": { "_type": "gameobject", "prefab": "prefabs/item_parcel.prefab" diff --git a/Assets/Items/Cloth/looseblackpants.clitem b/Assets/Items/Cloth/looseblackpants.clitem index 5635527..3854428 100644 --- a/Assets/Items/Cloth/looseblackpants.clitem +++ b/Assets/Items/Cloth/looseblackpants.clitem @@ -2,7 +2,7 @@ "ClothUrl": "ducksworkshop/looseblackpants", "Slot": "Body", "Name": "Loose Black Pants", - "Description": null, + "Description": "looseblackpants", "Prefab": { "_type": "gameobject", "prefab": "prefabs/item_parcel.prefab" diff --git a/Assets/Items/Cloth/loosebrownpants.clitem b/Assets/Items/Cloth/loosebrownpants.clitem index 7b1bfe4..7941b65 100644 --- a/Assets/Items/Cloth/loosebrownpants.clitem +++ b/Assets/Items/Cloth/loosebrownpants.clitem @@ -2,7 +2,7 @@ "ClothUrl": "ducksworkshop/loosebrownpants", "Slot": "Body", "Name": "Loose Brown Pants", - "Description": null, + "Description": "loosebrownpants", "Prefab": { "_type": "gameobject", "prefab": "prefabs/item_parcel.prefab" diff --git a/Assets/Items/Cloth/melonhelmet.clitem b/Assets/Items/Cloth/melonhelmet.clitem index 366ba0d..7470150 100644 --- a/Assets/Items/Cloth/melonhelmet.clitem +++ b/Assets/Items/Cloth/melonhelmet.clitem @@ -2,7 +2,7 @@ "ClothUrl": "gbonn/melonhelmet", "Slot": "Body", "Name": "Melon Helmet", - "Description": null, + "Description": "melonhelmet", "Prefab": { "_type": "gameobject", "prefab": "prefabs/item_parcel.prefab" diff --git a/Assets/Items/Cloth/nvg.clitem b/Assets/Items/Cloth/nvg.clitem index 3dcce5c..8864527 100644 --- a/Assets/Items/Cloth/nvg.clitem +++ b/Assets/Items/Cloth/nvg.clitem @@ -2,7 +2,7 @@ "ClothUrl": "bugulma/nvg", "Slot": "Body", "Name": "Night-vision Goggles", - "Description": null, + "Description": "nvg", "Prefab": { "_type": "gameobject", "prefab": "prefabs/item_parcel.prefab" diff --git a/Assets/Items/Cloth/paperbag.clitem b/Assets/Items/Cloth/paperbag.clitem index 857ddbb..d35c156 100644 --- a/Assets/Items/Cloth/paperbag.clitem +++ b/Assets/Items/Cloth/paperbag.clitem @@ -2,7 +2,7 @@ "ClothUrl": "raf/paperbag", "Slot": "Body", "Name": "Paper Bag Mask", - "Description": null, + "Description": "paperbag", "Prefab": { "_type": "gameobject", "prefab": "prefabs/item_parcel.prefab" diff --git a/Assets/Items/Cloth/piratehat.clitem b/Assets/Items/Cloth/piratehat.clitem index 3a04d87..22312e4 100644 --- a/Assets/Items/Cloth/piratehat.clitem +++ b/Assets/Items/Cloth/piratehat.clitem @@ -2,7 +2,7 @@ "ClothUrl": "zedskipper/piratehat", "Slot": "Body", "Name": "Pirate Hat", - "Description": null, + "Description": "piratehat", "Prefab": { "_type": "gameobject", "prefab": "prefabs/item_parcel.prefab" diff --git a/Assets/Items/Cloth/poncho2.clitem b/Assets/Items/Cloth/poncho2.clitem index df89a7b..4f89ae7 100644 --- a/Assets/Items/Cloth/poncho2.clitem +++ b/Assets/Items/Cloth/poncho2.clitem @@ -2,7 +2,7 @@ "ClothUrl": "edgyvoxel/poncho2", "Slot": "Body", "Name": "Western Poncho", - "Description": null, + "Description": "poncho2", "Prefab": { "_type": "gameobject", "prefab": "prefabs/item_parcel.prefab" diff --git a/Assets/Items/Cloth/propanetankhelm.clitem b/Assets/Items/Cloth/propanetankhelm.clitem index 94fb7d2..929e986 100644 --- a/Assets/Items/Cloth/propanetankhelm.clitem +++ b/Assets/Items/Cloth/propanetankhelm.clitem @@ -2,7 +2,7 @@ "ClothUrl": "ducksworkshop/propanetankhelm", "Slot": "Body", "Name": "Propane Tank Helm", - "Description": null, + "Description": "propanetankhelm", "Prefab": { "_type": "gameobject", "prefab": "prefabs/item_parcel.prefab" diff --git a/Assets/Items/Cloth/propellerhat.clitem b/Assets/Items/Cloth/propellerhat.clitem index 272c2cf..7b31cb6 100644 --- a/Assets/Items/Cloth/propellerhat.clitem +++ b/Assets/Items/Cloth/propellerhat.clitem @@ -2,7 +2,7 @@ "ClothUrl": "gbonn/propellerhat", "Slot": "Body", "Name": "Propeller Hat", - "Description": null, + "Description": "propellerhat", "Prefab": { "_type": "gameobject", "prefab": "prefabs/item_parcel.prefab" diff --git a/Assets/Items/Cloth/pyjamabottoms.clitem b/Assets/Items/Cloth/pyjamabottoms.clitem index 831ca39..3c73544 100644 --- a/Assets/Items/Cloth/pyjamabottoms.clitem +++ b/Assets/Items/Cloth/pyjamabottoms.clitem @@ -2,7 +2,7 @@ "ClothUrl": "pukes/pyjamabottoms", "Slot": "Body", "Name": "Pyjama Bottoms", - "Description": null, + "Description": "pyjamabottoms", "Prefab": { "_type": "gameobject", "prefab": "prefabs/item_parcel.prefab" diff --git a/Assets/Items/Cloth/pyjamatop.clitem b/Assets/Items/Cloth/pyjamatop.clitem index 9d0bc4e..75d09a4 100644 --- a/Assets/Items/Cloth/pyjamatop.clitem +++ b/Assets/Items/Cloth/pyjamatop.clitem @@ -2,7 +2,7 @@ "ClothUrl": "pukes/pyjamatop", "Slot": "Body", "Name": "Pyjama Top", - "Description": null, + "Description": "pyjamatop", "Prefab": { "_type": "gameobject", "prefab": "prefabs/item_parcel.prefab" diff --git a/Assets/Items/Cloth/rangerhelmet.clitem b/Assets/Items/Cloth/rangerhelmet.clitem index bb5b088..9dd9869 100644 --- a/Assets/Items/Cloth/rangerhelmet.clitem +++ b/Assets/Items/Cloth/rangerhelmet.clitem @@ -2,7 +2,7 @@ "ClothUrl": "bulldog/rangerhelmet", "Slot": "Body", "Name": "Ranger Helmet", - "Description": null, + "Description": "rangerhelmet", "Prefab": { "_type": "gameobject", "prefab": "prefabs/item_parcel.prefab" diff --git a/Assets/Items/Cloth/reapersuit.clitem b/Assets/Items/Cloth/reapersuit.clitem index 03feffd..53663a4 100644 --- a/Assets/Items/Cloth/reapersuit.clitem +++ b/Assets/Items/Cloth/reapersuit.clitem @@ -2,7 +2,7 @@ "ClothUrl": "microfivetwotwo/reapersuit", "Slot": "Body", "Name": "Reaper Suit", - "Description": null, + "Description": "reapersuit", "Prefab": { "_type": "gameobject", "prefab": "prefabs/item_parcel.prefab" diff --git a/Assets/Items/Cloth/retrotechracerhelmet.clitem b/Assets/Items/Cloth/retrotechracerhelmet.clitem index 6757bbc..f69b2dd 100644 --- a/Assets/Items/Cloth/retrotechracerhelmet.clitem +++ b/Assets/Items/Cloth/retrotechracerhelmet.clitem @@ -2,7 +2,7 @@ "ClothUrl": "microfivetwotwo/retrotechracerhelmet", "Slot": "Body", "Name": "Retrotech Racer Helmet", - "Description": null, + "Description": "retrotechracerhelmet", "Prefab": { "_type": "gameobject", "prefab": "prefabs/item_parcel.prefab" diff --git a/Assets/Items/Cloth/safetyglasses.clitem b/Assets/Items/Cloth/safetyglasses.clitem index bbc9518..c50d15d 100644 --- a/Assets/Items/Cloth/safetyglasses.clitem +++ b/Assets/Items/Cloth/safetyglasses.clitem @@ -2,7 +2,7 @@ "ClothUrl": "gkaf/safetyglasses", "Slot": "Body", "Name": "Safety Glasses", - "Description": null, + "Description": "safetyglasses", "Prefab": { "_type": "gameobject", "prefab": "prefabs/item_parcel.prefab" diff --git a/Assets/Items/Cloth/sfsocks.clitem b/Assets/Items/Cloth/sfsocks.clitem index a0380b0..75d6e0d 100644 --- a/Assets/Items/Cloth/sfsocks.clitem +++ b/Assets/Items/Cloth/sfsocks.clitem @@ -2,7 +2,7 @@ "ClothUrl": "luke/sfsocks", "Slot": "Body", "Name": "Smallfish Socks", - "Description": null, + "Description": "sfsocks", "Prefab": { "_type": "gameobject", "prefab": "prefabs/item_parcel.prefab" diff --git a/Assets/Items/Cloth/sharkhead.clitem b/Assets/Items/Cloth/sharkhead.clitem index 36d5d11..42dd5d5 100644 --- a/Assets/Items/Cloth/sharkhead.clitem +++ b/Assets/Items/Cloth/sharkhead.clitem @@ -2,7 +2,7 @@ "ClothUrl": "shadb/sharkhead", "Slot": "Body", "Name": "Shark Head", - "Description": null, + "Description": "sharkhead", "Prefab": { "_type": "gameobject", "prefab": "prefabs/item_parcel.prefab" diff --git a/Assets/Items/Cloth/skibidilid.clitem b/Assets/Items/Cloth/skibidilid.clitem index b0aa7aa..d0c31ac 100644 --- a/Assets/Items/Cloth/skibidilid.clitem +++ b/Assets/Items/Cloth/skibidilid.clitem @@ -2,7 +2,7 @@ "ClothUrl": "microfivetwotwo/skibidilid", "Slot": "Body", "Name": "Skibidi Lid", - "Description": null, + "Description": "skibidilid", "Prefab": { "_type": "gameobject", "prefab": "prefabs/item_parcel.prefab" diff --git a/Assets/Items/Cloth/skihelmet.clitem b/Assets/Items/Cloth/skihelmet.clitem index 4924b98..5000518 100644 --- a/Assets/Items/Cloth/skihelmet.clitem +++ b/Assets/Items/Cloth/skihelmet.clitem @@ -2,7 +2,7 @@ "ClothUrl": "ducksworkshop/skihelmet", "Slot": "Body", "Name": "Ski Helmet", - "Description": null, + "Description": "skihelmet", "Prefab": { "_type": "gameobject", "prefab": "prefabs/item_parcel.prefab" diff --git a/Assets/Items/Cloth/skihelmetgreen.clitem b/Assets/Items/Cloth/skihelmetgreen.clitem index b69f281..dab9b55 100644 --- a/Assets/Items/Cloth/skihelmetgreen.clitem +++ b/Assets/Items/Cloth/skihelmetgreen.clitem @@ -2,7 +2,7 @@ "ClothUrl": "ducksworkshop/skihelmetgreen", "Slot": "Body", "Name": "Ski Helmet Green", - "Description": null, + "Description": "skihelmetgreen", "Prefab": { "_type": "gameobject", "prefab": "prefabs/item_parcel.prefab" diff --git a/Assets/Items/Cloth/sleepmask.clitem b/Assets/Items/Cloth/sleepmask.clitem index 8617d5f..47a66df 100644 --- a/Assets/Items/Cloth/sleepmask.clitem +++ b/Assets/Items/Cloth/sleepmask.clitem @@ -2,7 +2,7 @@ "ClothUrl": "pukes/sleepmask", "Slot": "Body", "Name": "Sleep Mask", - "Description": null, + "Description": "sleepmask", "Prefab": { "_type": "gameobject", "prefab": "prefabs/item_parcel.prefab" diff --git a/Assets/Items/Cloth/snowgoggles.clitem b/Assets/Items/Cloth/snowgoggles.clitem index 7f8e5cd..5e10099 100644 --- a/Assets/Items/Cloth/snowgoggles.clitem +++ b/Assets/Items/Cloth/snowgoggles.clitem @@ -2,7 +2,7 @@ "ClothUrl": "jammie/snowgoggles", "Slot": "Body", "Name": "Snow Goggles", - "Description": null, + "Description": "snowgoggles", "Prefab": { "_type": "gameobject", "prefab": "prefabs/item_parcel.prefab" diff --git a/Assets/Items/Cloth/snowmitten.clitem b/Assets/Items/Cloth/snowmitten.clitem index c9542e8..7886ce5 100644 --- a/Assets/Items/Cloth/snowmitten.clitem +++ b/Assets/Items/Cloth/snowmitten.clitem @@ -2,7 +2,7 @@ "ClothUrl": "jammie/snowmitten", "Slot": "Body", "Name": "Snow Mitten", - "Description": null, + "Description": "snowmitten", "Prefab": { "_type": "gameobject", "prefab": "prefabs/item_parcel.prefab" diff --git a/Assets/Items/Cloth/striped_jumper.clitem b/Assets/Items/Cloth/striped_jumper.clitem index d7ef545..ceda9bc 100644 --- a/Assets/Items/Cloth/striped_jumper.clitem +++ b/Assets/Items/Cloth/striped_jumper.clitem @@ -2,7 +2,7 @@ "ClothUrl": "saandy/striped_jumper", "Slot": "Body", "Name": "Striped Jumper", - "Description": null, + "Description": "stripedjumper", "Prefab": { "_type": "gameobject", "prefab": "prefabs/item_parcel.prefab" diff --git a/Assets/Items/Cloth/sunglasseswithanimatedlenses.clitem b/Assets/Items/Cloth/sunglasseswithanimatedlenses.clitem index 242e0d8..30b0b74 100644 --- a/Assets/Items/Cloth/sunglasseswithanimatedlenses.clitem +++ b/Assets/Items/Cloth/sunglasseswithanimatedlenses.clitem @@ -2,7 +2,7 @@ "ClothUrl": "microfivetwotwo/sunglasseswithanimatedlenses", "Slot": "Body", "Name": "Jackpot Animated Sunglasses", - "Description": null, + "Description": "sunglasseswithanimatedlenses", "Prefab": { "_type": "gameobject", "prefab": "prefabs/item_parcel.prefab" diff --git a/Assets/Items/Cloth/teashades.clitem b/Assets/Items/Cloth/teashades.clitem index 7b9dc78..0eb81c7 100644 --- a/Assets/Items/Cloth/teashades.clitem +++ b/Assets/Items/Cloth/teashades.clitem @@ -2,7 +2,7 @@ "ClothUrl": "bugulma/teashades", "Slot": "Body", "Name": "Teashade Sunglasses", - "Description": null, + "Description": "teashades", "Prefab": { "_type": "gameobject", "prefab": "prefabs/item_parcel.prefab" diff --git a/Assets/Items/Cloth/thugglasses.clitem b/Assets/Items/Cloth/thugglasses.clitem index 5f8c555..36f4a12 100644 --- a/Assets/Items/Cloth/thugglasses.clitem +++ b/Assets/Items/Cloth/thugglasses.clitem @@ -2,7 +2,7 @@ "ClothUrl": "fanlab/thugglasses", "Slot": "Body", "Name": "Thug Glasses", - "Description": null, + "Description": "thugglasses", "Prefab": { "_type": "gameobject", "prefab": "prefabs/item_parcel.prefab" diff --git a/Assets/Items/Cloth/tracktop.clitem b/Assets/Items/Cloth/tracktop.clitem index 2385144..86267e4 100644 --- a/Assets/Items/Cloth/tracktop.clitem +++ b/Assets/Items/Cloth/tracktop.clitem @@ -2,7 +2,7 @@ "ClothUrl": "daemoncast/tracktop", "Slot": "Body", "Name": "Tracktop", - "Description": null, + "Description": "tracktop", "Prefab": { "_type": "gameobject", "prefab": "prefabs/item_parcel.prefab" diff --git a/Assets/Items/Cloth/trafficcone.clitem b/Assets/Items/Cloth/trafficcone.clitem index de0ee60..f346d87 100644 --- a/Assets/Items/Cloth/trafficcone.clitem +++ b/Assets/Items/Cloth/trafficcone.clitem @@ -2,7 +2,7 @@ "ClothUrl": "gbonn/trafficcone", "Slot": "Body", "Name": "Traffic Cone", - "Description": null, + "Description": "trafficcone", "Prefab": { "_type": "gameobject", "prefab": "prefabs/item_parcel.prefab" diff --git a/Assets/Items/Cloth/varsityjacket.clitem b/Assets/Items/Cloth/varsityjacket.clitem index dc3215a..7e8d591 100644 --- a/Assets/Items/Cloth/varsityjacket.clitem +++ b/Assets/Items/Cloth/varsityjacket.clitem @@ -2,7 +2,7 @@ "ClothUrl": "luke/varsityjacket", "Slot": "Body", "Name": "Varsity Jacket", - "Description": null, + "Description": "varsityjacket", "Prefab": { "_type": "gameobject", "prefab": "prefabs/item_parcel.prefab" diff --git a/Assets/Items/Cloth/weldinggogglesvisorup.clitem b/Assets/Items/Cloth/weldinggogglesvisorup.clitem index f411b3c..a316685 100644 --- a/Assets/Items/Cloth/weldinggogglesvisorup.clitem +++ b/Assets/Items/Cloth/weldinggogglesvisorup.clitem @@ -2,7 +2,7 @@ "ClothUrl": "ducksworkshop/weldinggogglesvisorup", "Slot": "Body", "Name": "Welding Goggles Visor Up", - "Description": null, + "Description": "weldinggogglesvisorup", "Prefab": { "_type": "gameobject", "prefab": "prefabs/item_parcel.prefab" diff --git a/Assets/Items/Cloth/whitetanktop.clitem b/Assets/Items/Cloth/whitetanktop.clitem index 688690a..0a9125a 100644 --- a/Assets/Items/Cloth/whitetanktop.clitem +++ b/Assets/Items/Cloth/whitetanktop.clitem @@ -2,7 +2,7 @@ "ClothUrl": "ducksworkshop/whitetanktop", "Slot": "Body", "Name": "White Tank top", - "Description": null, + "Description": "whitetanktop", "Prefab": { "_type": "gameobject", "prefab": "prefabs/item_parcel.prefab" diff --git a/Assets/Items/Cloth/whitetanktopspoiled.clitem b/Assets/Items/Cloth/whitetanktopspoiled.clitem index 83361a5..94399a1 100644 --- a/Assets/Items/Cloth/whitetanktopspoiled.clitem +++ b/Assets/Items/Cloth/whitetanktopspoiled.clitem @@ -2,7 +2,7 @@ "ClothUrl": "ducksworkshop/whitetanktopspoiled", "Slot": "Body", "Name": "Spoiled White Tank Top", - "Description": null, + "Description": "whitetanktopspoiled", "Prefab": { "_type": "gameobject", "prefab": "prefabs/item_parcel.prefab" diff --git a/Assets/Items/Cloth/wizardhat.clitem b/Assets/Items/Cloth/wizardhat.clitem index 1017d5d..cd37825 100644 --- a/Assets/Items/Cloth/wizardhat.clitem +++ b/Assets/Items/Cloth/wizardhat.clitem @@ -2,7 +2,7 @@ "ClothUrl": "shadb/wizardhat", "Slot": "Body", "Name": "Wizard Hat", - "Description": null, + "Description": "wizardhat", "Prefab": { "_type": "gameobject", "prefab": "prefabs/item_parcel.prefab" diff --git a/Assets/Items/Cloth/xvioutfit.clitem b/Assets/Items/Cloth/xvioutfit.clitem index 19a7a84..26d4473 100644 --- a/Assets/Items/Cloth/xvioutfit.clitem +++ b/Assets/Items/Cloth/xvioutfit.clitem @@ -2,7 +2,7 @@ "ClothUrl": "edgyvoxel/xvioutfit", "Slot": "Body", "Name": "17th Outfit", - "Description": null, + "Description": "xvioutfit", "Prefab": { "_type": "gameobject", "prefab": "prefabs/item_parcel.prefab" diff --git a/Assets/scenes/test.scene b/Assets/scenes/test.scene index 3f081d3..b65ecd5 100644 --- a/Assets/scenes/test.scene +++ b/Assets/scenes/test.scene @@ -831,7 +831,7 @@ "__version": 1, "Flags": 0, "Name": "ClothSpawner", - "Position": "128,0,0", + "Position": "352,80,0", "Rotation": "0,0,0,1", "Scale": "1,1,1", "Tags": "", diff --git a/Code/Player/Dedugan.Inventory.cs b/Code/Player/Dedugan.Inventory.cs index de4e861..747dba1 100644 --- a/Code/Player/Dedugan.Inventory.cs +++ b/Code/Player/Dedugan.Inventory.cs @@ -123,7 +123,7 @@ public sealed partial class Dedugan : Component } else if ( item.Definition is ClothingItemDefinition clothingDef ) { - StripByName( clothingDef.Name ); + StripByName( clothingDef.Description ); } } diff --git a/Code/Player/Dedugan.Player.cs b/Code/Player/Dedugan.Player.cs index cd25199..8b2ee62 100644 --- a/Code/Player/Dedugan.Player.cs +++ b/Code/Player/Dedugan.Player.cs @@ -140,7 +140,12 @@ partial class Dedugan [Rpc.Broadcast] public void StripByName( string name ) { - CurrentClothing.Clothing.RemoveAll( entry => entry.Clothing.Title == name ); + CurrentClothing.Clothing.RemoveAll( entry => + { + Log.Info( entry.Clothing.ResourceName.Replace( "_", "" ) ); + + return entry.Clothing.ResourceName.Replace( "_", "" ).Replace( " ", "" ) == name; + } ); CurrentClothing.Normalize(); CurrentClothing.Apply( Renderer ); diff --git a/Code/WorlModelClothSpawner.cs b/Code/WorlModelClothSpawner.cs index e6042c4..3470efa 100644 --- a/Code/WorlModelClothSpawner.cs +++ b/Code/WorlModelClothSpawner.cs @@ -3,13 +3,13 @@ using Sasalka; public sealed class WorlModelClothSpawner : Component { [Property] public GameObject Prefab { get; set; } - - [Property] public Vector3 CenterPosition { get; set; } = Vector3.Zero; [Property] public float Spacing { get; set; } = 50.0f; [Property] public float Height { get; set; } = 0.0f; protected override void OnStart() { + if ( !Networking.IsHost ) return; + var definitions = ResourceLibrary.GetAll(); var clothingItemDefinitions = definitions.ToList(); int total = clothingItemDefinitions.Count(); @@ -20,40 +20,29 @@ public sealed class WorlModelClothSpawner : Component return; } - // Автоматически вычисляем минимальный радиус круга, чтобы вместить все предметы - // Площадь круга: πr², а площадь одного предмета: Spacing² - // Нам нужно чтобы πr² >= total * Spacing² → r >= sqrt(total * Spacing² / π) - float estimatedRadius = MathF.Sqrt( (total * Spacing * Spacing) / MathF.PI ); - float radius = estimatedRadius; + // Вычисляем размер стороны квадрата + int itemsPerSide = 10; //Math.CeilToInt( Mathf.Sqrt( total ) ); + float halfSize = (itemsPerSide - 1) * Spacing * 0.5f; - Log.Info( $"Auto-calculated radius: {radius}" ); + Log.Info( $"Spawning {total} items in {itemsPerSide}x{itemsPerSide} square grid" ); - int defIndex = 0; - - for ( float x = -radius; x <= radius; x += Spacing ) + for ( int i = 0; i < total; i++ ) { - for ( float y = -radius; y <= radius; y += Spacing ) - { - if ( defIndex >= total ) - break; + // Вычисляем позицию в сетке + int row = i / itemsPerSide; + int col = i % itemsPerSide; - if ( x * x + y * y <= radius * radius ) - { - Vector3 pos = CenterPosition + new Vector3( x, y, Height ); + float x = col * Spacing - halfSize; + float y = row * Spacing - halfSize; - var gO = Prefab.Clone( pos ); - gO.NetworkSpawn( null ); + Vector3 pos = WorldPosition + new Vector3( x, y, Height ); - var item = gO.Components.Get(); - if ( item is not null ) - item.Definition = clothingItemDefinitions[defIndex]; + var gO = Prefab.Clone( pos ); + gO.NetworkSpawn( null ); - defIndex++; - } - } - - if ( defIndex >= total ) - break; + var item = gO.Components.Get(); + if ( item is not null ) + item.Definition = clothingItemDefinitions[i]; } } } diff --git a/Editor/UpdateCloths.cs b/Editor/UpdateCloths.cs index ee724d0..fb9845c 100644 --- a/Editor/UpdateCloths.cs +++ b/Editor/UpdateCloths.cs @@ -11,7 +11,7 @@ public static class UpdateCloths [Menu( "Editor", "MyClothing/Generate .clitem Files" )] public static async void GenerateClitemFiles() { - var packageResult = await Package.FindAsync( "type:clothing", 100 ); + var packageResult = await Package.FindAsync( "type:clothing", 500 ); Directory.CreateDirectory( outputFolder ); @@ -30,7 +30,7 @@ public static class UpdateCloths ClothUrl = clothUrl, Slot = "Body", Name = package.Title, - Description = package.Description == "" ? package.Ident : package.Description, + Description = package.Ident.Replace( "_", "" ).Replace( " ", "" ), Prefab = new { _type = "gameobject", prefab = "prefabs/item_parcel.prefab" }, ImageTexture = (string)null, ImageUrl = imageUrl,