diff --git a/BondageClub/Assets/Female3DCG/ColorGroups.csv b/BondageClub/Assets/Female3DCG/ColorGroups.csv index faec94bdaf..ff47e95fb1 100644 --- a/BondageClub/Assets/Female3DCG/ColorGroups.csv +++ b/BondageClub/Assets/Female3DCG/ColorGroups.csv @@ -91,6 +91,7 @@ ItemDevicesXFrameFrame, Wood ItemDevicesXFrameMetal, Metal ItemFeetSturdyLeatherBeltsBelts,Belts ItemFeetSturdyLeatherBeltsMetal,Metal +ItemHandheldElectricGuitarStrap,Strap ItemHandheldKyosensuFan,Fan paper ItemHandhelddKyosensuFan1,Fan paper 2nd color ItemHandhelddKyosensuFan2,Fan paper 3rd color diff --git a/BondageClub/Assets/Female3DCG/Female3DCG.csv b/BondageClub/Assets/Female3DCG/Female3DCG.csv index 4b912f6e04..d64baf531a 100644 --- a/BondageClub/Assets/Female3DCG/Female3DCG.csv +++ b/BondageClub/Assets/Female3DCG/Female3DCG.csv @@ -1148,6 +1148,7 @@ ItemHandheld,Chocolate,Chocolate Bar ItemHandheld,Cigarette,Cigarette ItemHandheld,Crop,Crop ItemHandheld,DragonPlush,Dragon Plush +ItemHandheld,ElectricGuitar,Electric Guitar ItemHandheld,ElectricToothbrush,Electric Toothbrush ItemHandheld,Feather,Feather ItemHandheld,FeatherDuster,Feather Duster diff --git a/BondageClub/Assets/Female3DCG/Female3DCG.js b/BondageClub/Assets/Female3DCG/Female3DCG.js index db530cb60d..5ad5f8f4fa 100644 --- a/BondageClub/Assets/Female3DCG/Female3DCG.js +++ b/BondageClub/Assets/Female3DCG/Female3DCG.js @@ -46622,6 +46622,8 @@ var AssetFemale3DCG = [ }, { Name: "Chocolate", + InventoryID: 1331, + Value: 3, Random: false, Top: { [PoseType.DEFAULT]: 350, @@ -46657,6 +46659,52 @@ var AssetFemale3DCG = [ License: "CC BY-SA-NC 4.0", }, }, + { + Name: "ElectricGuitar", + InventoryID: 1332, + Value: 60, + Random: false, + Left: 20, + Top: 180, + Difficulty: -10, + Priority: 35, + IsRestraint: false, + DynamicGroupName: "ItemHandheld", + ParentGroup: {}, + DefaultColor: [ + "Default", + "Default", + "Default", + "#202020", + "Default", + "Default", + "Default", + "#333333", + "Default", + "Default", + "Default", + ], + PoseMapping: {}, + Layer: [ + { Name: "A1", ColorGroup: "Strap", Priority: 6 }, + { Name: "A2", ColorGroup: "Strap" }, + { Name: "A3" }, + { Name: "B1" }, + { Name: "B2", BlendingMode: "multiply", AllowColorize: false }, + { Name: "B3" }, + { Name: "B4" }, + { Name: "B5" }, + { Name: "B6" }, + { Name: "B7" }, + { Name: "B8" }, + { Name: "B9" }, + ], + Attribution: { + Author: "Echo (SugarChain)", + OriginalName: "电吉他", + License: "CC BY-SA-NC 4.0", + }, + }, ], Color: [ "Default", diff --git a/BondageClub/Assets/Female3DCG/ItemHandheld/ElectricGuitar_A1.png b/BondageClub/Assets/Female3DCG/ItemHandheld/ElectricGuitar_A1.png new file mode 100644 index 0000000000..7e629db031 Binary files /dev/null and b/BondageClub/Assets/Female3DCG/ItemHandheld/ElectricGuitar_A1.png differ diff --git a/BondageClub/Assets/Female3DCG/ItemHandheld/ElectricGuitar_A2.png b/BondageClub/Assets/Female3DCG/ItemHandheld/ElectricGuitar_A2.png new file mode 100644 index 0000000000..5b3dd1fca5 Binary files /dev/null and b/BondageClub/Assets/Female3DCG/ItemHandheld/ElectricGuitar_A2.png differ diff --git a/BondageClub/Assets/Female3DCG/ItemHandheld/ElectricGuitar_A3.png b/BondageClub/Assets/Female3DCG/ItemHandheld/ElectricGuitar_A3.png new file mode 100644 index 0000000000..05e0e1885c Binary files /dev/null and b/BondageClub/Assets/Female3DCG/ItemHandheld/ElectricGuitar_A3.png differ diff --git a/BondageClub/Assets/Female3DCG/ItemHandheld/ElectricGuitar_B1.png b/BondageClub/Assets/Female3DCG/ItemHandheld/ElectricGuitar_B1.png new file mode 100644 index 0000000000..5f368f2433 Binary files /dev/null and b/BondageClub/Assets/Female3DCG/ItemHandheld/ElectricGuitar_B1.png differ diff --git a/BondageClub/Assets/Female3DCG/ItemHandheld/ElectricGuitar_B2.png b/BondageClub/Assets/Female3DCG/ItemHandheld/ElectricGuitar_B2.png new file mode 100644 index 0000000000..fe6663df90 Binary files /dev/null and b/BondageClub/Assets/Female3DCG/ItemHandheld/ElectricGuitar_B2.png differ diff --git a/BondageClub/Assets/Female3DCG/ItemHandheld/ElectricGuitar_B3.png b/BondageClub/Assets/Female3DCG/ItemHandheld/ElectricGuitar_B3.png new file mode 100644 index 0000000000..1a7fd8f0e8 Binary files /dev/null and b/BondageClub/Assets/Female3DCG/ItemHandheld/ElectricGuitar_B3.png differ diff --git a/BondageClub/Assets/Female3DCG/ItemHandheld/ElectricGuitar_B4.png b/BondageClub/Assets/Female3DCG/ItemHandheld/ElectricGuitar_B4.png new file mode 100644 index 0000000000..210c2b06e1 Binary files /dev/null and b/BondageClub/Assets/Female3DCG/ItemHandheld/ElectricGuitar_B4.png differ diff --git a/BondageClub/Assets/Female3DCG/ItemHandheld/ElectricGuitar_B5.png b/BondageClub/Assets/Female3DCG/ItemHandheld/ElectricGuitar_B5.png new file mode 100644 index 0000000000..4c666af9da Binary files /dev/null and b/BondageClub/Assets/Female3DCG/ItemHandheld/ElectricGuitar_B5.png differ diff --git a/BondageClub/Assets/Female3DCG/ItemHandheld/ElectricGuitar_B6.png b/BondageClub/Assets/Female3DCG/ItemHandheld/ElectricGuitar_B6.png new file mode 100644 index 0000000000..c2862645d4 Binary files /dev/null and b/BondageClub/Assets/Female3DCG/ItemHandheld/ElectricGuitar_B6.png differ diff --git a/BondageClub/Assets/Female3DCG/ItemHandheld/ElectricGuitar_B7.png b/BondageClub/Assets/Female3DCG/ItemHandheld/ElectricGuitar_B7.png new file mode 100644 index 0000000000..633193e41a Binary files /dev/null and b/BondageClub/Assets/Female3DCG/ItemHandheld/ElectricGuitar_B7.png differ diff --git a/BondageClub/Assets/Female3DCG/ItemHandheld/ElectricGuitar_B8.png b/BondageClub/Assets/Female3DCG/ItemHandheld/ElectricGuitar_B8.png new file mode 100644 index 0000000000..7979b0afe9 Binary files /dev/null and b/BondageClub/Assets/Female3DCG/ItemHandheld/ElectricGuitar_B8.png differ diff --git a/BondageClub/Assets/Female3DCG/ItemHandheld/ElectricGuitar_B9.png b/BondageClub/Assets/Female3DCG/ItemHandheld/ElectricGuitar_B9.png new file mode 100644 index 0000000000..4c8d3837b7 Binary files /dev/null and b/BondageClub/Assets/Female3DCG/ItemHandheld/ElectricGuitar_B9.png differ diff --git a/BondageClub/Assets/Female3DCG/ItemHandheld/Preview/ElectricGuitar.png b/BondageClub/Assets/Female3DCG/ItemHandheld/Preview/ElectricGuitar.png new file mode 100644 index 0000000000..20788022d2 Binary files /dev/null and b/BondageClub/Assets/Female3DCG/ItemHandheld/Preview/ElectricGuitar.png differ diff --git a/BondageClub/Assets/Female3DCG/LayerNames.csv b/BondageClub/Assets/Female3DCG/LayerNames.csv index 6489e1691a..b0d13e72be 100644 --- a/BondageClub/Assets/Female3DCG/LayerNames.csv +++ b/BondageClub/Assets/Female3DCG/LayerNames.csv @@ -1870,6 +1870,18 @@ ItemHandheldDragonPlushGemsColor,Gems Color ItemHandheldDragonPlushEyesMainColor,Eyes Main Color ItemHandheldDragonPlushEyesGlowColor,Eyes Glow Color ItemHandheldDragonPlushShadows,Shadows +ItemHandheldElectricGuitarA1,Hip +ItemHandheldElectricGuitarA2,Shoulder +ItemHandheldElectricGuitarA3,Strap Button +ItemHandheldElectricGuitarB1,Wood body +ItemHandheldElectricGuitarB2,B2 +ItemHandheldElectricGuitarB3,Plastic body +ItemHandheldElectricGuitarB4,Chords +ItemHandheldElectricGuitarB5,Pickups +ItemHandheldElectricGuitarB6,Borders +ItemHandheldElectricGuitarB7,Tuners +ItemHandheldElectricGuitarB8,Frets +ItemHandheldElectricGuitarB9,B9 ItemHandheldFoxPlushBase1,Base ItemHandheldFoxPlushBase2,Accent ItemHandheldGiftBoxBox,Box