diff --git a/Content/BP/female/BP_Female.uasset b/Content/BP/female/BP_Female.uasset index e23046a..44f6fe6 100644 Binary files a/Content/BP/female/BP_Female.uasset and b/Content/BP/female/BP_Female.uasset differ diff --git a/Content/BP/gameMode/BP_WBIFGameModeBase.uasset b/Content/BP/gameMode/BP_WBIFGameModeBase.uasset index 1e304b0..8688da9 100644 Binary files a/Content/BP/gameMode/BP_WBIFGameModeBase.uasset and b/Content/BP/gameMode/BP_WBIFGameModeBase.uasset differ diff --git a/Content/BP/instance/GameInstanceWBIF.uasset b/Content/BP/instance/GameInstanceWBIF.uasset index 292d897..2783caa 100644 Binary files a/Content/BP/instance/GameInstanceWBIF.uasset and b/Content/BP/instance/GameInstanceWBIF.uasset differ diff --git a/Content/BP/item/BP_BaseItem.uasset b/Content/BP/item/BP_BaseItem.uasset index eaf2ebb..ceb7f0e 100644 Binary files a/Content/BP/item/BP_BaseItem.uasset and b/Content/BP/item/BP_BaseItem.uasset differ diff --git a/Content/assets/Meshes/SM_Bath_Tub.uasset b/Content/assets/Meshes/SM_Bath_Tub.uasset new file mode 100644 index 0000000..5113296 Binary files /dev/null and b/Content/assets/Meshes/SM_Bath_Tub.uasset differ diff --git a/Content/assets/Meshes/SM_Bed_1A.uasset b/Content/assets/Meshes/SM_Bed_1A.uasset new file mode 100644 index 0000000..f42fbc8 Binary files /dev/null and b/Content/assets/Meshes/SM_Bed_1A.uasset differ diff --git a/Content/assets/Meshes/SM_Bed_1B.uasset b/Content/assets/Meshes/SM_Bed_1B.uasset new file mode 100644 index 0000000..49eda5c Binary files /dev/null and b/Content/assets/Meshes/SM_Bed_1B.uasset differ diff --git a/Content/assets/Meshes/SM_Bed_2A.uasset b/Content/assets/Meshes/SM_Bed_2A.uasset new file mode 100644 index 0000000..cfb2005 Binary files /dev/null and b/Content/assets/Meshes/SM_Bed_2A.uasset differ diff --git a/Content/assets/Meshes/SM_Bed_2B.uasset b/Content/assets/Meshes/SM_Bed_2B.uasset new file mode 100644 index 0000000..672d49f Binary files /dev/null and b/Content/assets/Meshes/SM_Bed_2B.uasset differ diff --git a/Content/assets/Meshes/SM_Bench.uasset b/Content/assets/Meshes/SM_Bench.uasset new file mode 100644 index 0000000..5e5632f Binary files /dev/null and b/Content/assets/Meshes/SM_Bench.uasset differ diff --git a/Content/assets/Meshes/SM_Books_1.uasset b/Content/assets/Meshes/SM_Books_1.uasset new file mode 100644 index 0000000..107dbf4 Binary files /dev/null and b/Content/assets/Meshes/SM_Books_1.uasset differ diff --git a/Content/assets/Meshes/SM_Books_2.uasset b/Content/assets/Meshes/SM_Books_2.uasset new file mode 100644 index 0000000..6d67c45 Binary files /dev/null and b/Content/assets/Meshes/SM_Books_2.uasset differ diff --git a/Content/assets/Meshes/SM_Books_3.uasset b/Content/assets/Meshes/SM_Books_3.uasset new file mode 100644 index 0000000..4bcd655 Binary files /dev/null and b/Content/assets/Meshes/SM_Books_3.uasset differ diff --git a/Content/assets/Meshes/SM_Books_4.uasset b/Content/assets/Meshes/SM_Books_4.uasset new file mode 100644 index 0000000..02b6aa1 Binary files /dev/null and b/Content/assets/Meshes/SM_Books_4.uasset differ diff --git a/Content/assets/Meshes/SM_Books_5.uasset b/Content/assets/Meshes/SM_Books_5.uasset new file mode 100644 index 0000000..3707ec9 Binary files /dev/null and b/Content/assets/Meshes/SM_Books_5.uasset differ diff --git a/Content/assets/Meshes/SM_Books_6.uasset b/Content/assets/Meshes/SM_Books_6.uasset new file mode 100644 index 0000000..6ad5a45 Binary files /dev/null and b/Content/assets/Meshes/SM_Books_6.uasset differ diff --git a/Content/assets/Meshes/SM_Bottle_1.uasset b/Content/assets/Meshes/SM_Bottle_1.uasset new file mode 100644 index 0000000..02eedd9 Binary files /dev/null and b/Content/assets/Meshes/SM_Bottle_1.uasset differ diff --git a/Content/assets/Meshes/SM_Bottle_2.uasset b/Content/assets/Meshes/SM_Bottle_2.uasset new file mode 100644 index 0000000..7d55235 Binary files /dev/null and b/Content/assets/Meshes/SM_Bottle_2.uasset differ diff --git a/Content/assets/Meshes/SM_Bowl.uasset b/Content/assets/Meshes/SM_Bowl.uasset new file mode 100644 index 0000000..aa54464 Binary files /dev/null and b/Content/assets/Meshes/SM_Bowl.uasset differ diff --git a/Content/assets/Meshes/SM_Carpet_1A.uasset b/Content/assets/Meshes/SM_Carpet_1A.uasset new file mode 100644 index 0000000..2730d53 Binary files /dev/null and b/Content/assets/Meshes/SM_Carpet_1A.uasset differ diff --git a/Content/assets/Meshes/SM_Carpet_1B.uasset b/Content/assets/Meshes/SM_Carpet_1B.uasset new file mode 100644 index 0000000..fdee796 Binary files /dev/null and b/Content/assets/Meshes/SM_Carpet_1B.uasset differ diff --git a/Content/assets/Meshes/SM_Carpet_1C.uasset b/Content/assets/Meshes/SM_Carpet_1C.uasset new file mode 100644 index 0000000..4bd36df Binary files /dev/null and b/Content/assets/Meshes/SM_Carpet_1C.uasset differ diff --git a/Content/assets/Meshes/SM_Carpet_2A.uasset b/Content/assets/Meshes/SM_Carpet_2A.uasset new file mode 100644 index 0000000..28913f2 Binary files /dev/null and b/Content/assets/Meshes/SM_Carpet_2A.uasset differ diff --git a/Content/assets/Meshes/SM_Carpet_2B.uasset b/Content/assets/Meshes/SM_Carpet_2B.uasset new file mode 100644 index 0000000..e4d40da Binary files /dev/null and b/Content/assets/Meshes/SM_Carpet_2B.uasset differ diff --git a/Content/assets/Meshes/SM_Carpet_3A.uasset b/Content/assets/Meshes/SM_Carpet_3A.uasset new file mode 100644 index 0000000..5fe3f1b Binary files /dev/null and b/Content/assets/Meshes/SM_Carpet_3A.uasset differ diff --git a/Content/assets/Meshes/SM_Carpet_3B.uasset b/Content/assets/Meshes/SM_Carpet_3B.uasset new file mode 100644 index 0000000..922c850 Binary files /dev/null and b/Content/assets/Meshes/SM_Carpet_3B.uasset differ diff --git a/Content/assets/Meshes/SM_Carpet_3C.uasset b/Content/assets/Meshes/SM_Carpet_3C.uasset new file mode 100644 index 0000000..4a5db5f Binary files /dev/null and b/Content/assets/Meshes/SM_Carpet_3C.uasset differ diff --git a/Content/assets/Meshes/SM_Chair_1A.uasset b/Content/assets/Meshes/SM_Chair_1A.uasset new file mode 100644 index 0000000..65fa794 Binary files /dev/null and b/Content/assets/Meshes/SM_Chair_1A.uasset differ diff --git a/Content/assets/Meshes/SM_Chair_1B.uasset b/Content/assets/Meshes/SM_Chair_1B.uasset new file mode 100644 index 0000000..704abca Binary files /dev/null and b/Content/assets/Meshes/SM_Chair_1B.uasset differ diff --git a/Content/assets/Meshes/SM_Chair_2.uasset b/Content/assets/Meshes/SM_Chair_2.uasset new file mode 100644 index 0000000..a399332 Binary files /dev/null and b/Content/assets/Meshes/SM_Chair_2.uasset differ diff --git a/Content/assets/Meshes/SM_Chair_3.uasset b/Content/assets/Meshes/SM_Chair_3.uasset new file mode 100644 index 0000000..2e87092 Binary files /dev/null and b/Content/assets/Meshes/SM_Chair_3.uasset differ diff --git a/Content/assets/Meshes/SM_Classic_Commode.uasset b/Content/assets/Meshes/SM_Classic_Commode.uasset new file mode 100644 index 0000000..9136f63 Binary files /dev/null and b/Content/assets/Meshes/SM_Classic_Commode.uasset differ diff --git a/Content/assets/Meshes/SM_Classic_Picture.uasset b/Content/assets/Meshes/SM_Classic_Picture.uasset new file mode 100644 index 0000000..57e0d13 Binary files /dev/null and b/Content/assets/Meshes/SM_Classic_Picture.uasset differ diff --git a/Content/assets/Meshes/SM_Classic_table.uasset b/Content/assets/Meshes/SM_Classic_table.uasset new file mode 100644 index 0000000..00b1fa8 Binary files /dev/null and b/Content/assets/Meshes/SM_Classic_table.uasset differ diff --git a/Content/assets/Meshes/SM_Clock.uasset b/Content/assets/Meshes/SM_Clock.uasset new file mode 100644 index 0000000..0f98995 Binary files /dev/null and b/Content/assets/Meshes/SM_Clock.uasset differ diff --git a/Content/assets/Meshes/SM_Commode.uasset b/Content/assets/Meshes/SM_Commode.uasset new file mode 100644 index 0000000..210f2d4 Binary files /dev/null and b/Content/assets/Meshes/SM_Commode.uasset differ diff --git a/Content/assets/Meshes/SM_Computer_1.uasset b/Content/assets/Meshes/SM_Computer_1.uasset new file mode 100644 index 0000000..c6388b3 Binary files /dev/null and b/Content/assets/Meshes/SM_Computer_1.uasset differ diff --git a/Content/assets/Meshes/SM_Computer_2.uasset b/Content/assets/Meshes/SM_Computer_2.uasset new file mode 100644 index 0000000..59a9798 Binary files /dev/null and b/Content/assets/Meshes/SM_Computer_2.uasset differ diff --git a/Content/assets/Meshes/SM_Computer_3A.uasset b/Content/assets/Meshes/SM_Computer_3A.uasset new file mode 100644 index 0000000..03e148d Binary files /dev/null and b/Content/assets/Meshes/SM_Computer_3A.uasset differ diff --git a/Content/assets/Meshes/SM_Computer_3B.uasset b/Content/assets/Meshes/SM_Computer_3B.uasset new file mode 100644 index 0000000..5fd8f6b Binary files /dev/null and b/Content/assets/Meshes/SM_Computer_3B.uasset differ diff --git a/Content/assets/Meshes/SM_Computer_4A.uasset b/Content/assets/Meshes/SM_Computer_4A.uasset new file mode 100644 index 0000000..10fb86a Binary files /dev/null and b/Content/assets/Meshes/SM_Computer_4A.uasset differ diff --git a/Content/assets/Meshes/SM_Computer_4B.uasset b/Content/assets/Meshes/SM_Computer_4B.uasset new file mode 100644 index 0000000..b68f13d Binary files /dev/null and b/Content/assets/Meshes/SM_Computer_4B.uasset differ diff --git a/Content/assets/Meshes/SM_Computer_5A.uasset b/Content/assets/Meshes/SM_Computer_5A.uasset new file mode 100644 index 0000000..673483f Binary files /dev/null and b/Content/assets/Meshes/SM_Computer_5A.uasset differ diff --git a/Content/assets/Meshes/SM_Computer_5B.uasset b/Content/assets/Meshes/SM_Computer_5B.uasset new file mode 100644 index 0000000..6310e1d Binary files /dev/null and b/Content/assets/Meshes/SM_Computer_5B.uasset differ diff --git a/Content/assets/Meshes/SM_Cooker.uasset b/Content/assets/Meshes/SM_Cooker.uasset new file mode 100644 index 0000000..d51cce2 Binary files /dev/null and b/Content/assets/Meshes/SM_Cooker.uasset differ diff --git a/Content/assets/Meshes/SM_Couch_1A.uasset b/Content/assets/Meshes/SM_Couch_1A.uasset new file mode 100644 index 0000000..1944e9a Binary files /dev/null and b/Content/assets/Meshes/SM_Couch_1A.uasset differ diff --git a/Content/assets/Meshes/SM_Couch_1B.uasset b/Content/assets/Meshes/SM_Couch_1B.uasset new file mode 100644 index 0000000..18a9fc0 Binary files /dev/null and b/Content/assets/Meshes/SM_Couch_1B.uasset differ diff --git a/Content/assets/Meshes/SM_Couch_2A.uasset b/Content/assets/Meshes/SM_Couch_2A.uasset new file mode 100644 index 0000000..f34987b Binary files /dev/null and b/Content/assets/Meshes/SM_Couch_2A.uasset differ diff --git a/Content/assets/Meshes/SM_Couch_2B.uasset b/Content/assets/Meshes/SM_Couch_2B.uasset new file mode 100644 index 0000000..8da1174 Binary files /dev/null and b/Content/assets/Meshes/SM_Couch_2B.uasset differ diff --git a/Content/assets/Meshes/SM_Couch_3A.uasset b/Content/assets/Meshes/SM_Couch_3A.uasset new file mode 100644 index 0000000..8cab04c Binary files /dev/null and b/Content/assets/Meshes/SM_Couch_3A.uasset differ diff --git a/Content/assets/Meshes/SM_Couch_3B.uasset b/Content/assets/Meshes/SM_Couch_3B.uasset new file mode 100644 index 0000000..95d3047 Binary files /dev/null and b/Content/assets/Meshes/SM_Couch_3B.uasset differ diff --git a/Content/assets/Meshes/SM_Couch_4A.uasset b/Content/assets/Meshes/SM_Couch_4A.uasset new file mode 100644 index 0000000..4e997f4 Binary files /dev/null and b/Content/assets/Meshes/SM_Couch_4A.uasset differ diff --git a/Content/assets/Meshes/SM_Couch_4B.uasset b/Content/assets/Meshes/SM_Couch_4B.uasset new file mode 100644 index 0000000..eb378a8 Binary files /dev/null and b/Content/assets/Meshes/SM_Couch_4B.uasset differ diff --git a/Content/assets/Meshes/SM_Cup_1.uasset b/Content/assets/Meshes/SM_Cup_1.uasset new file mode 100644 index 0000000..d38a50f Binary files /dev/null and b/Content/assets/Meshes/SM_Cup_1.uasset differ diff --git a/Content/assets/Meshes/SM_Cup_2.uasset b/Content/assets/Meshes/SM_Cup_2.uasset new file mode 100644 index 0000000..d6e2205 Binary files /dev/null and b/Content/assets/Meshes/SM_Cup_2.uasset differ diff --git a/Content/assets/Meshes/SM_Cup_3.uasset b/Content/assets/Meshes/SM_Cup_3.uasset new file mode 100644 index 0000000..e31e30c Binary files /dev/null and b/Content/assets/Meshes/SM_Cup_3.uasset differ diff --git a/Content/assets/Meshes/SM_Cup_4.uasset b/Content/assets/Meshes/SM_Cup_4.uasset new file mode 100644 index 0000000..5345c3b Binary files /dev/null and b/Content/assets/Meshes/SM_Cup_4.uasset differ diff --git a/Content/assets/Meshes/SM_Cupboard_1_1.uasset b/Content/assets/Meshes/SM_Cupboard_1_1.uasset new file mode 100644 index 0000000..e25ead5 Binary files /dev/null and b/Content/assets/Meshes/SM_Cupboard_1_1.uasset differ diff --git a/Content/assets/Meshes/SM_Cupboard_1_2.uasset b/Content/assets/Meshes/SM_Cupboard_1_2.uasset new file mode 100644 index 0000000..c722474 Binary files /dev/null and b/Content/assets/Meshes/SM_Cupboard_1_2.uasset differ diff --git a/Content/assets/Meshes/SM_Cupboard_1_3.uasset b/Content/assets/Meshes/SM_Cupboard_1_3.uasset new file mode 100644 index 0000000..953e7be Binary files /dev/null and b/Content/assets/Meshes/SM_Cupboard_1_3.uasset differ diff --git a/Content/assets/Meshes/SM_Cupboard_1_4.uasset b/Content/assets/Meshes/SM_Cupboard_1_4.uasset new file mode 100644 index 0000000..c73141b Binary files /dev/null and b/Content/assets/Meshes/SM_Cupboard_1_4.uasset differ diff --git a/Content/assets/Meshes/SM_Cupboard_2_1.uasset b/Content/assets/Meshes/SM_Cupboard_2_1.uasset new file mode 100644 index 0000000..becdd88 Binary files /dev/null and b/Content/assets/Meshes/SM_Cupboard_2_1.uasset differ diff --git a/Content/assets/Meshes/SM_Cupboard_2_2.uasset b/Content/assets/Meshes/SM_Cupboard_2_2.uasset new file mode 100644 index 0000000..9d44e4b Binary files /dev/null and b/Content/assets/Meshes/SM_Cupboard_2_2.uasset differ diff --git a/Content/assets/Meshes/SM_Cupboard_2_3.uasset b/Content/assets/Meshes/SM_Cupboard_2_3.uasset new file mode 100644 index 0000000..b11d2c9 Binary files /dev/null and b/Content/assets/Meshes/SM_Cupboard_2_3.uasset differ diff --git a/Content/assets/Meshes/SM_Cupboard_2_4.uasset b/Content/assets/Meshes/SM_Cupboard_2_4.uasset new file mode 100644 index 0000000..7e942e4 Binary files /dev/null and b/Content/assets/Meshes/SM_Cupboard_2_4.uasset differ diff --git a/Content/assets/Meshes/SM_Curtain_1.uasset b/Content/assets/Meshes/SM_Curtain_1.uasset new file mode 100644 index 0000000..cc12d55 Binary files /dev/null and b/Content/assets/Meshes/SM_Curtain_1.uasset differ diff --git a/Content/assets/Meshes/SM_Curtain_2.uasset b/Content/assets/Meshes/SM_Curtain_2.uasset new file mode 100644 index 0000000..a6930d4 Binary files /dev/null and b/Content/assets/Meshes/SM_Curtain_2.uasset differ diff --git a/Content/assets/Meshes/SM_Curtain_3.uasset b/Content/assets/Meshes/SM_Curtain_3.uasset new file mode 100644 index 0000000..eab4fb6 Binary files /dev/null and b/Content/assets/Meshes/SM_Curtain_3.uasset differ diff --git a/Content/assets/Meshes/SM_Desk_1.uasset b/Content/assets/Meshes/SM_Desk_1.uasset new file mode 100644 index 0000000..2d70160 Binary files /dev/null and b/Content/assets/Meshes/SM_Desk_1.uasset differ diff --git a/Content/assets/Meshes/SM_Desk_2.uasset b/Content/assets/Meshes/SM_Desk_2.uasset new file mode 100644 index 0000000..6f02c3c Binary files /dev/null and b/Content/assets/Meshes/SM_Desk_2.uasset differ diff --git a/Content/assets/Meshes/SM_Door_1A.uasset b/Content/assets/Meshes/SM_Door_1A.uasset new file mode 100644 index 0000000..0dcdb2a Binary files /dev/null and b/Content/assets/Meshes/SM_Door_1A.uasset differ diff --git a/Content/assets/Meshes/SM_Door_1B.uasset b/Content/assets/Meshes/SM_Door_1B.uasset new file mode 100644 index 0000000..eb0238e Binary files /dev/null and b/Content/assets/Meshes/SM_Door_1B.uasset differ diff --git a/Content/assets/Meshes/SM_Door_2A.uasset b/Content/assets/Meshes/SM_Door_2A.uasset new file mode 100644 index 0000000..eac5512 Binary files /dev/null and b/Content/assets/Meshes/SM_Door_2A.uasset differ diff --git a/Content/assets/Meshes/SM_Door_2B.uasset b/Content/assets/Meshes/SM_Door_2B.uasset new file mode 100644 index 0000000..2947fc5 Binary files /dev/null and b/Content/assets/Meshes/SM_Door_2B.uasset differ diff --git a/Content/assets/Meshes/SM_Drawer_1A.uasset b/Content/assets/Meshes/SM_Drawer_1A.uasset new file mode 100644 index 0000000..1f059fc Binary files /dev/null and b/Content/assets/Meshes/SM_Drawer_1A.uasset differ diff --git a/Content/assets/Meshes/SM_Drawer_1B.uasset b/Content/assets/Meshes/SM_Drawer_1B.uasset new file mode 100644 index 0000000..4e9c0f7 Binary files /dev/null and b/Content/assets/Meshes/SM_Drawer_1B.uasset differ diff --git a/Content/assets/Meshes/SM_Drawer_2A.uasset b/Content/assets/Meshes/SM_Drawer_2A.uasset new file mode 100644 index 0000000..5f72378 Binary files /dev/null and b/Content/assets/Meshes/SM_Drawer_2A.uasset differ diff --git a/Content/assets/Meshes/SM_Drawer_2B.uasset b/Content/assets/Meshes/SM_Drawer_2B.uasset new file mode 100644 index 0000000..6b29c4a Binary files /dev/null and b/Content/assets/Meshes/SM_Drawer_2B.uasset differ diff --git a/Content/assets/Meshes/SM_Drawer_3A.uasset b/Content/assets/Meshes/SM_Drawer_3A.uasset new file mode 100644 index 0000000..0642bad Binary files /dev/null and b/Content/assets/Meshes/SM_Drawer_3A.uasset differ diff --git a/Content/assets/Meshes/SM_Drawer_3B.uasset b/Content/assets/Meshes/SM_Drawer_3B.uasset new file mode 100644 index 0000000..0939d15 Binary files /dev/null and b/Content/assets/Meshes/SM_Drawer_3B.uasset differ diff --git a/Content/assets/Meshes/SM_Drawer_4.uasset b/Content/assets/Meshes/SM_Drawer_4.uasset new file mode 100644 index 0000000..251018e Binary files /dev/null and b/Content/assets/Meshes/SM_Drawer_4.uasset differ diff --git a/Content/assets/Meshes/SM_DustBin_1.uasset b/Content/assets/Meshes/SM_DustBin_1.uasset new file mode 100644 index 0000000..71b6e65 Binary files /dev/null and b/Content/assets/Meshes/SM_DustBin_1.uasset differ diff --git a/Content/assets/Meshes/SM_DustBin_2.uasset b/Content/assets/Meshes/SM_DustBin_2.uasset new file mode 100644 index 0000000..587d287 Binary files /dev/null and b/Content/assets/Meshes/SM_DustBin_2.uasset differ diff --git a/Content/assets/Meshes/SM_Electric_Box.uasset b/Content/assets/Meshes/SM_Electric_Box.uasset new file mode 100644 index 0000000..ac6e5a1 Binary files /dev/null and b/Content/assets/Meshes/SM_Electric_Box.uasset differ diff --git a/Content/assets/Meshes/SM_Fan.uasset b/Content/assets/Meshes/SM_Fan.uasset new file mode 100644 index 0000000..1f1ee7e Binary files /dev/null and b/Content/assets/Meshes/SM_Fan.uasset differ diff --git a/Content/assets/Meshes/SM_Floor_1A.uasset b/Content/assets/Meshes/SM_Floor_1A.uasset new file mode 100644 index 0000000..0d2a467 Binary files /dev/null and b/Content/assets/Meshes/SM_Floor_1A.uasset differ diff --git a/Content/assets/Meshes/SM_Floor_1B.uasset b/Content/assets/Meshes/SM_Floor_1B.uasset new file mode 100644 index 0000000..47b2437 Binary files /dev/null and b/Content/assets/Meshes/SM_Floor_1B.uasset differ diff --git a/Content/assets/Meshes/SM_Floor_2A.uasset b/Content/assets/Meshes/SM_Floor_2A.uasset new file mode 100644 index 0000000..f65a038 Binary files /dev/null and b/Content/assets/Meshes/SM_Floor_2A.uasset differ diff --git a/Content/assets/Meshes/SM_Floor_2B.uasset b/Content/assets/Meshes/SM_Floor_2B.uasset new file mode 100644 index 0000000..e806f4d Binary files /dev/null and b/Content/assets/Meshes/SM_Floor_2B.uasset differ diff --git a/Content/assets/Meshes/SM_Floor_3A.uasset b/Content/assets/Meshes/SM_Floor_3A.uasset new file mode 100644 index 0000000..e4af17c Binary files /dev/null and b/Content/assets/Meshes/SM_Floor_3A.uasset differ diff --git a/Content/assets/Meshes/SM_Floor_3B.uasset b/Content/assets/Meshes/SM_Floor_3B.uasset new file mode 100644 index 0000000..38c1dba Binary files /dev/null and b/Content/assets/Meshes/SM_Floor_3B.uasset differ diff --git a/Content/assets/Meshes/SM_Floor_4A.uasset b/Content/assets/Meshes/SM_Floor_4A.uasset new file mode 100644 index 0000000..3b96566 Binary files /dev/null and b/Content/assets/Meshes/SM_Floor_4A.uasset differ diff --git a/Content/assets/Meshes/SM_Floor_4B.uasset b/Content/assets/Meshes/SM_Floor_4B.uasset new file mode 100644 index 0000000..524f39a Binary files /dev/null and b/Content/assets/Meshes/SM_Floor_4B.uasset differ diff --git a/Content/assets/Meshes/SM_Floor_5A.uasset b/Content/assets/Meshes/SM_Floor_5A.uasset new file mode 100644 index 0000000..41807ba Binary files /dev/null and b/Content/assets/Meshes/SM_Floor_5A.uasset differ diff --git a/Content/assets/Meshes/SM_Floor_5B.uasset b/Content/assets/Meshes/SM_Floor_5B.uasset new file mode 100644 index 0000000..45aaec6 Binary files /dev/null and b/Content/assets/Meshes/SM_Floor_5B.uasset differ diff --git a/Content/assets/Meshes/SM_Fridge.uasset b/Content/assets/Meshes/SM_Fridge.uasset new file mode 100644 index 0000000..55f36e0 Binary files /dev/null and b/Content/assets/Meshes/SM_Fridge.uasset differ diff --git a/Content/assets/Meshes/SM_Heater.uasset b/Content/assets/Meshes/SM_Heater.uasset new file mode 100644 index 0000000..af217a2 Binary files /dev/null and b/Content/assets/Meshes/SM_Heater.uasset differ diff --git a/Content/assets/Meshes/SM_Kitchen_Cabinet_1A.uasset b/Content/assets/Meshes/SM_Kitchen_Cabinet_1A.uasset new file mode 100644 index 0000000..9465f7b Binary files /dev/null and b/Content/assets/Meshes/SM_Kitchen_Cabinet_1A.uasset differ diff --git a/Content/assets/Meshes/SM_Kitchen_Cabinet_1B.uasset b/Content/assets/Meshes/SM_Kitchen_Cabinet_1B.uasset new file mode 100644 index 0000000..51eea68 Binary files /dev/null and b/Content/assets/Meshes/SM_Kitchen_Cabinet_1B.uasset differ diff --git a/Content/assets/Meshes/SM_Kitchen_Cabinet_2A.uasset b/Content/assets/Meshes/SM_Kitchen_Cabinet_2A.uasset new file mode 100644 index 0000000..42f8bf1 Binary files /dev/null and b/Content/assets/Meshes/SM_Kitchen_Cabinet_2A.uasset differ diff --git a/Content/assets/Meshes/SM_Kitchen_Cabinet_2B.uasset b/Content/assets/Meshes/SM_Kitchen_Cabinet_2B.uasset new file mode 100644 index 0000000..e35a23f Binary files /dev/null and b/Content/assets/Meshes/SM_Kitchen_Cabinet_2B.uasset differ diff --git a/Content/assets/Meshes/SM_Kitchen_Cabinet_3A.uasset b/Content/assets/Meshes/SM_Kitchen_Cabinet_3A.uasset new file mode 100644 index 0000000..230d8bd Binary files /dev/null and b/Content/assets/Meshes/SM_Kitchen_Cabinet_3A.uasset differ diff --git a/Content/assets/Meshes/SM_Kitchen_Cabinet_3B.uasset b/Content/assets/Meshes/SM_Kitchen_Cabinet_3B.uasset new file mode 100644 index 0000000..23abf97 Binary files /dev/null and b/Content/assets/Meshes/SM_Kitchen_Cabinet_3B.uasset differ diff --git a/Content/assets/Meshes/SM_Kitchen_Cabinet_4A.uasset b/Content/assets/Meshes/SM_Kitchen_Cabinet_4A.uasset new file mode 100644 index 0000000..20c6eb7 Binary files /dev/null and b/Content/assets/Meshes/SM_Kitchen_Cabinet_4A.uasset differ diff --git a/Content/assets/Meshes/SM_Kitchen_Cabinet_4B.uasset b/Content/assets/Meshes/SM_Kitchen_Cabinet_4B.uasset new file mode 100644 index 0000000..147fb88 Binary files /dev/null and b/Content/assets/Meshes/SM_Kitchen_Cabinet_4B.uasset differ diff --git a/Content/assets/Meshes/SM_Kitchen_Cabinet_5A.uasset b/Content/assets/Meshes/SM_Kitchen_Cabinet_5A.uasset new file mode 100644 index 0000000..1c1215e Binary files /dev/null and b/Content/assets/Meshes/SM_Kitchen_Cabinet_5A.uasset differ diff --git a/Content/assets/Meshes/SM_Kitchen_Cabinet_5B.uasset b/Content/assets/Meshes/SM_Kitchen_Cabinet_5B.uasset new file mode 100644 index 0000000..519778d Binary files /dev/null and b/Content/assets/Meshes/SM_Kitchen_Cabinet_5B.uasset differ diff --git a/Content/assets/Meshes/SM_Kitchen_Cabinet_6A.uasset b/Content/assets/Meshes/SM_Kitchen_Cabinet_6A.uasset new file mode 100644 index 0000000..95fd019 Binary files /dev/null and b/Content/assets/Meshes/SM_Kitchen_Cabinet_6A.uasset differ diff --git a/Content/assets/Meshes/SM_Kitchen_Cabinet_6B.uasset b/Content/assets/Meshes/SM_Kitchen_Cabinet_6B.uasset new file mode 100644 index 0000000..817bf13 Binary files /dev/null and b/Content/assets/Meshes/SM_Kitchen_Cabinet_6B.uasset differ diff --git a/Content/assets/Meshes/SM_Kitchen_Cooking.uasset b/Content/assets/Meshes/SM_Kitchen_Cooking.uasset new file mode 100644 index 0000000..69bb0d1 Binary files /dev/null and b/Content/assets/Meshes/SM_Kitchen_Cooking.uasset differ diff --git a/Content/assets/Meshes/SM_Lamp_1A.uasset b/Content/assets/Meshes/SM_Lamp_1A.uasset new file mode 100644 index 0000000..09a235b Binary files /dev/null and b/Content/assets/Meshes/SM_Lamp_1A.uasset differ diff --git a/Content/assets/Meshes/SM_Lamp_1B.uasset b/Content/assets/Meshes/SM_Lamp_1B.uasset new file mode 100644 index 0000000..f40fed4 Binary files /dev/null and b/Content/assets/Meshes/SM_Lamp_1B.uasset differ diff --git a/Content/assets/Meshes/SM_Lamp_night_1A.uasset b/Content/assets/Meshes/SM_Lamp_night_1A.uasset new file mode 100644 index 0000000..2b92c69 Binary files /dev/null and b/Content/assets/Meshes/SM_Lamp_night_1A.uasset differ diff --git a/Content/assets/Meshes/SM_Lamp_night_1B.uasset b/Content/assets/Meshes/SM_Lamp_night_1B.uasset new file mode 100644 index 0000000..4a3f5e0 Binary files /dev/null and b/Content/assets/Meshes/SM_Lamp_night_1B.uasset differ diff --git a/Content/assets/Meshes/SM_Microwave_Oven.uasset b/Content/assets/Meshes/SM_Microwave_Oven.uasset new file mode 100644 index 0000000..636a479 Binary files /dev/null and b/Content/assets/Meshes/SM_Microwave_Oven.uasset differ diff --git a/Content/assets/Meshes/SM_Mirror.uasset b/Content/assets/Meshes/SM_Mirror.uasset new file mode 100644 index 0000000..562e9df Binary files /dev/null and b/Content/assets/Meshes/SM_Mirror.uasset differ diff --git a/Content/assets/Meshes/SM_Modern_Bed_2.uasset b/Content/assets/Meshes/SM_Modern_Bed_2.uasset new file mode 100644 index 0000000..43d5608 Binary files /dev/null and b/Content/assets/Meshes/SM_Modern_Bed_2.uasset differ diff --git a/Content/assets/Meshes/SM_Modern_Sofa_1.uasset b/Content/assets/Meshes/SM_Modern_Sofa_1.uasset new file mode 100644 index 0000000..521e233 Binary files /dev/null and b/Content/assets/Meshes/SM_Modern_Sofa_1.uasset differ diff --git a/Content/assets/Meshes/SM_Paint_1.uasset b/Content/assets/Meshes/SM_Paint_1.uasset new file mode 100644 index 0000000..f5f23b2 Binary files /dev/null and b/Content/assets/Meshes/SM_Paint_1.uasset differ diff --git a/Content/assets/Meshes/SM_Paint_10.uasset b/Content/assets/Meshes/SM_Paint_10.uasset new file mode 100644 index 0000000..0b98939 Binary files /dev/null and b/Content/assets/Meshes/SM_Paint_10.uasset differ diff --git a/Content/assets/Meshes/SM_Paint_11.uasset b/Content/assets/Meshes/SM_Paint_11.uasset new file mode 100644 index 0000000..1e103f1 Binary files /dev/null and b/Content/assets/Meshes/SM_Paint_11.uasset differ diff --git a/Content/assets/Meshes/SM_Paint_12.uasset b/Content/assets/Meshes/SM_Paint_12.uasset new file mode 100644 index 0000000..f324c10 Binary files /dev/null and b/Content/assets/Meshes/SM_Paint_12.uasset differ diff --git a/Content/assets/Meshes/SM_Paint_13.uasset b/Content/assets/Meshes/SM_Paint_13.uasset new file mode 100644 index 0000000..f0f1c6f Binary files /dev/null and b/Content/assets/Meshes/SM_Paint_13.uasset differ diff --git a/Content/assets/Meshes/SM_Paint_14.uasset b/Content/assets/Meshes/SM_Paint_14.uasset new file mode 100644 index 0000000..9617364 Binary files /dev/null and b/Content/assets/Meshes/SM_Paint_14.uasset differ diff --git a/Content/assets/Meshes/SM_Paint_2.uasset b/Content/assets/Meshes/SM_Paint_2.uasset new file mode 100644 index 0000000..ffeffae Binary files /dev/null and b/Content/assets/Meshes/SM_Paint_2.uasset differ diff --git a/Content/assets/Meshes/SM_Paint_3.uasset b/Content/assets/Meshes/SM_Paint_3.uasset new file mode 100644 index 0000000..41ec66c Binary files /dev/null and b/Content/assets/Meshes/SM_Paint_3.uasset differ diff --git a/Content/assets/Meshes/SM_Paint_4.uasset b/Content/assets/Meshes/SM_Paint_4.uasset new file mode 100644 index 0000000..a87d060 Binary files /dev/null and b/Content/assets/Meshes/SM_Paint_4.uasset differ diff --git a/Content/assets/Meshes/SM_Paint_5.uasset b/Content/assets/Meshes/SM_Paint_5.uasset new file mode 100644 index 0000000..a81870c Binary files /dev/null and b/Content/assets/Meshes/SM_Paint_5.uasset differ diff --git a/Content/assets/Meshes/SM_Paint_6.uasset b/Content/assets/Meshes/SM_Paint_6.uasset new file mode 100644 index 0000000..7ad27d3 Binary files /dev/null and b/Content/assets/Meshes/SM_Paint_6.uasset differ diff --git a/Content/assets/Meshes/SM_Paint_7.uasset b/Content/assets/Meshes/SM_Paint_7.uasset new file mode 100644 index 0000000..c6c375a Binary files /dev/null and b/Content/assets/Meshes/SM_Paint_7.uasset differ diff --git a/Content/assets/Meshes/SM_Paint_8.uasset b/Content/assets/Meshes/SM_Paint_8.uasset new file mode 100644 index 0000000..27bd514 Binary files /dev/null and b/Content/assets/Meshes/SM_Paint_8.uasset differ diff --git a/Content/assets/Meshes/SM_Paint_9.uasset b/Content/assets/Meshes/SM_Paint_9.uasset new file mode 100644 index 0000000..2d0aea7 Binary files /dev/null and b/Content/assets/Meshes/SM_Paint_9.uasset differ diff --git a/Content/assets/Meshes/SM_Phone.uasset b/Content/assets/Meshes/SM_Phone.uasset new file mode 100644 index 0000000..bfdfdf8 Binary files /dev/null and b/Content/assets/Meshes/SM_Phone.uasset differ diff --git a/Content/assets/Meshes/SM_Picture.uasset b/Content/assets/Meshes/SM_Picture.uasset new file mode 100644 index 0000000..ffeaef1 Binary files /dev/null and b/Content/assets/Meshes/SM_Picture.uasset differ diff --git a/Content/assets/Meshes/SM_Pillow_1A.uasset b/Content/assets/Meshes/SM_Pillow_1A.uasset new file mode 100644 index 0000000..252f7da Binary files /dev/null and b/Content/assets/Meshes/SM_Pillow_1A.uasset differ diff --git a/Content/assets/Meshes/SM_Pillow_1B.uasset b/Content/assets/Meshes/SM_Pillow_1B.uasset new file mode 100644 index 0000000..6734d0f Binary files /dev/null and b/Content/assets/Meshes/SM_Pillow_1B.uasset differ diff --git a/Content/assets/Meshes/SM_Pillow_2A.uasset b/Content/assets/Meshes/SM_Pillow_2A.uasset new file mode 100644 index 0000000..3353b3b Binary files /dev/null and b/Content/assets/Meshes/SM_Pillow_2A.uasset differ diff --git a/Content/assets/Meshes/SM_Pillow_2B.uasset b/Content/assets/Meshes/SM_Pillow_2B.uasset new file mode 100644 index 0000000..93657bc Binary files /dev/null and b/Content/assets/Meshes/SM_Pillow_2B.uasset differ diff --git a/Content/assets/Meshes/SM_Pillow_3A.uasset b/Content/assets/Meshes/SM_Pillow_3A.uasset new file mode 100644 index 0000000..9bf5d5f Binary files /dev/null and b/Content/assets/Meshes/SM_Pillow_3A.uasset differ diff --git a/Content/assets/Meshes/SM_Pillow_3B.uasset b/Content/assets/Meshes/SM_Pillow_3B.uasset new file mode 100644 index 0000000..7a40f56 Binary files /dev/null and b/Content/assets/Meshes/SM_Pillow_3B.uasset differ diff --git a/Content/assets/Meshes/SM_Plate.uasset b/Content/assets/Meshes/SM_Plate.uasset new file mode 100644 index 0000000..a8a7767 Binary files /dev/null and b/Content/assets/Meshes/SM_Plate.uasset differ diff --git a/Content/assets/Meshes/SM_Pot_Flower_1.uasset b/Content/assets/Meshes/SM_Pot_Flower_1.uasset new file mode 100644 index 0000000..0599b2b Binary files /dev/null and b/Content/assets/Meshes/SM_Pot_Flower_1.uasset differ diff --git a/Content/assets/Meshes/SM_Pot_Flower_2.uasset b/Content/assets/Meshes/SM_Pot_Flower_2.uasset new file mode 100644 index 0000000..7eb46a1 Binary files /dev/null and b/Content/assets/Meshes/SM_Pot_Flower_2.uasset differ diff --git a/Content/assets/Meshes/SM_Shelves_1A.uasset b/Content/assets/Meshes/SM_Shelves_1A.uasset new file mode 100644 index 0000000..7fe9922 Binary files /dev/null and b/Content/assets/Meshes/SM_Shelves_1A.uasset differ diff --git a/Content/assets/Meshes/SM_Shelves_1B.uasset b/Content/assets/Meshes/SM_Shelves_1B.uasset new file mode 100644 index 0000000..a3f96bc Binary files /dev/null and b/Content/assets/Meshes/SM_Shelves_1B.uasset differ diff --git a/Content/assets/Meshes/SM_Shelves_2A.uasset b/Content/assets/Meshes/SM_Shelves_2A.uasset new file mode 100644 index 0000000..76d6330 Binary files /dev/null and b/Content/assets/Meshes/SM_Shelves_2A.uasset differ diff --git a/Content/assets/Meshes/SM_Shelves_2B.uasset b/Content/assets/Meshes/SM_Shelves_2B.uasset new file mode 100644 index 0000000..ddc236c Binary files /dev/null and b/Content/assets/Meshes/SM_Shelves_2B.uasset differ diff --git a/Content/assets/Meshes/SM_Shelves_3A.uasset b/Content/assets/Meshes/SM_Shelves_3A.uasset new file mode 100644 index 0000000..efbd3fb Binary files /dev/null and b/Content/assets/Meshes/SM_Shelves_3A.uasset differ diff --git a/Content/assets/Meshes/SM_Shelves_3B.uasset b/Content/assets/Meshes/SM_Shelves_3B.uasset new file mode 100644 index 0000000..b8d8f7a Binary files /dev/null and b/Content/assets/Meshes/SM_Shelves_3B.uasset differ diff --git a/Content/assets/Meshes/SM_Speaker.uasset b/Content/assets/Meshes/SM_Speaker.uasset new file mode 100644 index 0000000..6bfa85a Binary files /dev/null and b/Content/assets/Meshes/SM_Speaker.uasset differ diff --git a/Content/assets/Meshes/SM_Stool_1A.uasset b/Content/assets/Meshes/SM_Stool_1A.uasset new file mode 100644 index 0000000..58e4756 Binary files /dev/null and b/Content/assets/Meshes/SM_Stool_1A.uasset differ diff --git a/Content/assets/Meshes/SM_Stool_1B.uasset b/Content/assets/Meshes/SM_Stool_1B.uasset new file mode 100644 index 0000000..5084bd1 Binary files /dev/null and b/Content/assets/Meshes/SM_Stool_1B.uasset differ diff --git a/Content/assets/Meshes/SM_Stool_2.uasset b/Content/assets/Meshes/SM_Stool_2.uasset new file mode 100644 index 0000000..7da00ad Binary files /dev/null and b/Content/assets/Meshes/SM_Stool_2.uasset differ diff --git a/Content/assets/Meshes/SM_Stool_3A.uasset b/Content/assets/Meshes/SM_Stool_3A.uasset new file mode 100644 index 0000000..6956171 Binary files /dev/null and b/Content/assets/Meshes/SM_Stool_3A.uasset differ diff --git a/Content/assets/Meshes/SM_Stool_3B.uasset b/Content/assets/Meshes/SM_Stool_3B.uasset new file mode 100644 index 0000000..6672416 Binary files /dev/null and b/Content/assets/Meshes/SM_Stool_3B.uasset differ diff --git a/Content/assets/Meshes/SM_TV.uasset b/Content/assets/Meshes/SM_TV.uasset new file mode 100644 index 0000000..951ed79 Binary files /dev/null and b/Content/assets/Meshes/SM_TV.uasset differ diff --git a/Content/assets/Meshes/SM_TV_1A.uasset b/Content/assets/Meshes/SM_TV_1A.uasset new file mode 100644 index 0000000..5e0acc7 Binary files /dev/null and b/Content/assets/Meshes/SM_TV_1A.uasset differ diff --git a/Content/assets/Meshes/SM_TV_1B.uasset b/Content/assets/Meshes/SM_TV_1B.uasset new file mode 100644 index 0000000..22ed7d3 Binary files /dev/null and b/Content/assets/Meshes/SM_TV_1B.uasset differ diff --git a/Content/assets/Meshes/SM_TV_2.uasset b/Content/assets/Meshes/SM_TV_2.uasset new file mode 100644 index 0000000..d725127 Binary files /dev/null and b/Content/assets/Meshes/SM_TV_2.uasset differ diff --git a/Content/assets/Meshes/SM_Table_1A.uasset b/Content/assets/Meshes/SM_Table_1A.uasset new file mode 100644 index 0000000..43d9fad Binary files /dev/null and b/Content/assets/Meshes/SM_Table_1A.uasset differ diff --git a/Content/assets/Meshes/SM_Table_1B.uasset b/Content/assets/Meshes/SM_Table_1B.uasset new file mode 100644 index 0000000..11369a7 Binary files /dev/null and b/Content/assets/Meshes/SM_Table_1B.uasset differ diff --git a/Content/assets/Meshes/SM_Table_2.uasset b/Content/assets/Meshes/SM_Table_2.uasset new file mode 100644 index 0000000..cae3527 Binary files /dev/null and b/Content/assets/Meshes/SM_Table_2.uasset differ diff --git a/Content/assets/Meshes/SM_Table_3.uasset b/Content/assets/Meshes/SM_Table_3.uasset new file mode 100644 index 0000000..be1a0a1 Binary files /dev/null and b/Content/assets/Meshes/SM_Table_3.uasset differ diff --git a/Content/assets/Meshes/SM_Table_4.uasset b/Content/assets/Meshes/SM_Table_4.uasset new file mode 100644 index 0000000..3ae11d4 Binary files /dev/null and b/Content/assets/Meshes/SM_Table_4.uasset differ diff --git a/Content/assets/Meshes/SM_Table_5A.uasset b/Content/assets/Meshes/SM_Table_5A.uasset new file mode 100644 index 0000000..d5b9027 Binary files /dev/null and b/Content/assets/Meshes/SM_Table_5A.uasset differ diff --git a/Content/assets/Meshes/SM_Table_5B.uasset b/Content/assets/Meshes/SM_Table_5B.uasset new file mode 100644 index 0000000..11fde8e Binary files /dev/null and b/Content/assets/Meshes/SM_Table_5B.uasset differ diff --git a/Content/assets/Meshes/SM_Table_6A.uasset b/Content/assets/Meshes/SM_Table_6A.uasset new file mode 100644 index 0000000..b71344f Binary files /dev/null and b/Content/assets/Meshes/SM_Table_6A.uasset differ diff --git a/Content/assets/Meshes/SM_Table_6B.uasset b/Content/assets/Meshes/SM_Table_6B.uasset new file mode 100644 index 0000000..a4b1e1b Binary files /dev/null and b/Content/assets/Meshes/SM_Table_6B.uasset differ diff --git a/Content/assets/Meshes/SM_Toilet.uasset b/Content/assets/Meshes/SM_Toilet.uasset new file mode 100644 index 0000000..abf23f6 Binary files /dev/null and b/Content/assets/Meshes/SM_Toilet.uasset differ diff --git a/Content/assets/Meshes/SM_Toilet_Seat.uasset b/Content/assets/Meshes/SM_Toilet_Seat.uasset new file mode 100644 index 0000000..e00eebc Binary files /dev/null and b/Content/assets/Meshes/SM_Toilet_Seat.uasset differ diff --git a/Content/assets/Meshes/SM_Towel_1.uasset b/Content/assets/Meshes/SM_Towel_1.uasset new file mode 100644 index 0000000..413a965 Binary files /dev/null and b/Content/assets/Meshes/SM_Towel_1.uasset differ diff --git a/Content/assets/Meshes/SM_Towel_2.uasset b/Content/assets/Meshes/SM_Towel_2.uasset new file mode 100644 index 0000000..0a67d11 Binary files /dev/null and b/Content/assets/Meshes/SM_Towel_2.uasset differ diff --git a/Content/assets/Meshes/SM_Towel_Rack.uasset b/Content/assets/Meshes/SM_Towel_Rack.uasset new file mode 100644 index 0000000..f5d06a1 Binary files /dev/null and b/Content/assets/Meshes/SM_Towel_Rack.uasset differ diff --git a/Content/assets/Meshes/SM_Wall_1_1.uasset b/Content/assets/Meshes/SM_Wall_1_1.uasset new file mode 100644 index 0000000..1cc0bf6 Binary files /dev/null and b/Content/assets/Meshes/SM_Wall_1_1.uasset differ diff --git a/Content/assets/Meshes/SM_Wall_1_10.uasset b/Content/assets/Meshes/SM_Wall_1_10.uasset new file mode 100644 index 0000000..ad1dbf7 Binary files /dev/null and b/Content/assets/Meshes/SM_Wall_1_10.uasset differ diff --git a/Content/assets/Meshes/SM_Wall_1_11.uasset b/Content/assets/Meshes/SM_Wall_1_11.uasset new file mode 100644 index 0000000..2e2738e Binary files /dev/null and b/Content/assets/Meshes/SM_Wall_1_11.uasset differ diff --git a/Content/assets/Meshes/SM_Wall_1_12.uasset b/Content/assets/Meshes/SM_Wall_1_12.uasset new file mode 100644 index 0000000..b833a92 Binary files /dev/null and b/Content/assets/Meshes/SM_Wall_1_12.uasset differ diff --git a/Content/assets/Meshes/SM_Wall_1_13.uasset b/Content/assets/Meshes/SM_Wall_1_13.uasset new file mode 100644 index 0000000..8219e4a Binary files /dev/null and b/Content/assets/Meshes/SM_Wall_1_13.uasset differ diff --git a/Content/assets/Meshes/SM_Wall_1_14.uasset b/Content/assets/Meshes/SM_Wall_1_14.uasset new file mode 100644 index 0000000..2fcb5a5 Binary files /dev/null and b/Content/assets/Meshes/SM_Wall_1_14.uasset differ diff --git a/Content/assets/Meshes/SM_Wall_1_15.uasset b/Content/assets/Meshes/SM_Wall_1_15.uasset new file mode 100644 index 0000000..7b58fec Binary files /dev/null and b/Content/assets/Meshes/SM_Wall_1_15.uasset differ diff --git a/Content/assets/Meshes/SM_Wall_1_16.uasset b/Content/assets/Meshes/SM_Wall_1_16.uasset new file mode 100644 index 0000000..916dfe8 Binary files /dev/null and b/Content/assets/Meshes/SM_Wall_1_16.uasset differ diff --git a/Content/assets/Meshes/SM_Wall_1_17.uasset b/Content/assets/Meshes/SM_Wall_1_17.uasset new file mode 100644 index 0000000..c284b31 Binary files /dev/null and b/Content/assets/Meshes/SM_Wall_1_17.uasset differ diff --git a/Content/assets/Meshes/SM_Wall_1_2.uasset b/Content/assets/Meshes/SM_Wall_1_2.uasset new file mode 100644 index 0000000..461a445 Binary files /dev/null and b/Content/assets/Meshes/SM_Wall_1_2.uasset differ diff --git a/Content/assets/Meshes/SM_Wall_1_3.uasset b/Content/assets/Meshes/SM_Wall_1_3.uasset new file mode 100644 index 0000000..43d1ebe Binary files /dev/null and b/Content/assets/Meshes/SM_Wall_1_3.uasset differ diff --git a/Content/assets/Meshes/SM_Wall_1_4.uasset b/Content/assets/Meshes/SM_Wall_1_4.uasset new file mode 100644 index 0000000..0479a33 Binary files /dev/null and b/Content/assets/Meshes/SM_Wall_1_4.uasset differ diff --git a/Content/assets/Meshes/SM_Wall_1_5.uasset b/Content/assets/Meshes/SM_Wall_1_5.uasset new file mode 100644 index 0000000..d12e7ed Binary files /dev/null and b/Content/assets/Meshes/SM_Wall_1_5.uasset differ diff --git a/Content/assets/Meshes/SM_Wall_1_6.uasset b/Content/assets/Meshes/SM_Wall_1_6.uasset new file mode 100644 index 0000000..55c3eeb Binary files /dev/null and b/Content/assets/Meshes/SM_Wall_1_6.uasset differ diff --git a/Content/assets/Meshes/SM_Wall_1_7.uasset b/Content/assets/Meshes/SM_Wall_1_7.uasset new file mode 100644 index 0000000..af81b42 Binary files /dev/null and b/Content/assets/Meshes/SM_Wall_1_7.uasset differ diff --git a/Content/assets/Meshes/SM_Wall_1_8.uasset b/Content/assets/Meshes/SM_Wall_1_8.uasset new file mode 100644 index 0000000..86aeff3 Binary files /dev/null and b/Content/assets/Meshes/SM_Wall_1_8.uasset differ diff --git a/Content/assets/Meshes/SM_Wall_1_9.uasset b/Content/assets/Meshes/SM_Wall_1_9.uasset new file mode 100644 index 0000000..eac3f59 Binary files /dev/null and b/Content/assets/Meshes/SM_Wall_1_9.uasset differ diff --git a/Content/assets/Meshes/SM_Wall_2_1.uasset b/Content/assets/Meshes/SM_Wall_2_1.uasset new file mode 100644 index 0000000..a8baff9 Binary files /dev/null and b/Content/assets/Meshes/SM_Wall_2_1.uasset differ diff --git a/Content/assets/Meshes/SM_Wall_2_10.uasset b/Content/assets/Meshes/SM_Wall_2_10.uasset new file mode 100644 index 0000000..1b710e9 Binary files /dev/null and b/Content/assets/Meshes/SM_Wall_2_10.uasset differ diff --git a/Content/assets/Meshes/SM_Wall_2_11.uasset b/Content/assets/Meshes/SM_Wall_2_11.uasset new file mode 100644 index 0000000..272d6ec Binary files /dev/null and b/Content/assets/Meshes/SM_Wall_2_11.uasset differ diff --git a/Content/assets/Meshes/SM_Wall_2_12.uasset b/Content/assets/Meshes/SM_Wall_2_12.uasset new file mode 100644 index 0000000..25fb01f Binary files /dev/null and b/Content/assets/Meshes/SM_Wall_2_12.uasset differ diff --git a/Content/assets/Meshes/SM_Wall_2_13.uasset b/Content/assets/Meshes/SM_Wall_2_13.uasset new file mode 100644 index 0000000..0a8c858 Binary files /dev/null and b/Content/assets/Meshes/SM_Wall_2_13.uasset differ diff --git a/Content/assets/Meshes/SM_Wall_2_14.uasset b/Content/assets/Meshes/SM_Wall_2_14.uasset new file mode 100644 index 0000000..8214934 Binary files /dev/null and b/Content/assets/Meshes/SM_Wall_2_14.uasset differ diff --git a/Content/assets/Meshes/SM_Wall_2_15.uasset b/Content/assets/Meshes/SM_Wall_2_15.uasset new file mode 100644 index 0000000..81047be Binary files /dev/null and b/Content/assets/Meshes/SM_Wall_2_15.uasset differ diff --git a/Content/assets/Meshes/SM_Wall_2_16.uasset b/Content/assets/Meshes/SM_Wall_2_16.uasset new file mode 100644 index 0000000..2ec68bd Binary files /dev/null and b/Content/assets/Meshes/SM_Wall_2_16.uasset differ diff --git a/Content/assets/Meshes/SM_Wall_2_17.uasset b/Content/assets/Meshes/SM_Wall_2_17.uasset new file mode 100644 index 0000000..6f5e271 Binary files /dev/null and b/Content/assets/Meshes/SM_Wall_2_17.uasset differ diff --git a/Content/assets/Meshes/SM_Wall_2_2.uasset b/Content/assets/Meshes/SM_Wall_2_2.uasset new file mode 100644 index 0000000..d05566f Binary files /dev/null and b/Content/assets/Meshes/SM_Wall_2_2.uasset differ diff --git a/Content/assets/Meshes/SM_Wall_2_3.uasset b/Content/assets/Meshes/SM_Wall_2_3.uasset new file mode 100644 index 0000000..e880dea Binary files /dev/null and b/Content/assets/Meshes/SM_Wall_2_3.uasset differ diff --git a/Content/assets/Meshes/SM_Wall_2_4.uasset b/Content/assets/Meshes/SM_Wall_2_4.uasset new file mode 100644 index 0000000..34a42d3 Binary files /dev/null and b/Content/assets/Meshes/SM_Wall_2_4.uasset differ diff --git a/Content/assets/Meshes/SM_Wall_2_5.uasset b/Content/assets/Meshes/SM_Wall_2_5.uasset new file mode 100644 index 0000000..c8087ea Binary files /dev/null and b/Content/assets/Meshes/SM_Wall_2_5.uasset differ diff --git a/Content/assets/Meshes/SM_Wall_2_6.uasset b/Content/assets/Meshes/SM_Wall_2_6.uasset new file mode 100644 index 0000000..bfb3198 Binary files /dev/null and b/Content/assets/Meshes/SM_Wall_2_6.uasset differ diff --git a/Content/assets/Meshes/SM_Wall_2_7.uasset b/Content/assets/Meshes/SM_Wall_2_7.uasset new file mode 100644 index 0000000..a1302db Binary files /dev/null and b/Content/assets/Meshes/SM_Wall_2_7.uasset differ diff --git a/Content/assets/Meshes/SM_Wall_2_8.uasset b/Content/assets/Meshes/SM_Wall_2_8.uasset new file mode 100644 index 0000000..6040579 Binary files /dev/null and b/Content/assets/Meshes/SM_Wall_2_8.uasset differ diff --git a/Content/assets/Meshes/SM_Wall_2_9.uasset b/Content/assets/Meshes/SM_Wall_2_9.uasset new file mode 100644 index 0000000..19e6831 Binary files /dev/null and b/Content/assets/Meshes/SM_Wall_2_9.uasset differ diff --git a/Content/assets/Meshes/SM_Wall_3_1.uasset b/Content/assets/Meshes/SM_Wall_3_1.uasset new file mode 100644 index 0000000..0ce1997 Binary files /dev/null and b/Content/assets/Meshes/SM_Wall_3_1.uasset differ diff --git a/Content/assets/Meshes/SM_Wall_3_10.uasset b/Content/assets/Meshes/SM_Wall_3_10.uasset new file mode 100644 index 0000000..446098b Binary files /dev/null and b/Content/assets/Meshes/SM_Wall_3_10.uasset differ diff --git a/Content/assets/Meshes/SM_Wall_3_11.uasset b/Content/assets/Meshes/SM_Wall_3_11.uasset new file mode 100644 index 0000000..ca3dd00 Binary files /dev/null and b/Content/assets/Meshes/SM_Wall_3_11.uasset differ diff --git a/Content/assets/Meshes/SM_Wall_3_12.uasset b/Content/assets/Meshes/SM_Wall_3_12.uasset new file mode 100644 index 0000000..3575bf7 Binary files /dev/null and b/Content/assets/Meshes/SM_Wall_3_12.uasset differ diff --git a/Content/assets/Meshes/SM_Wall_3_13.uasset b/Content/assets/Meshes/SM_Wall_3_13.uasset new file mode 100644 index 0000000..9d10960 Binary files /dev/null and b/Content/assets/Meshes/SM_Wall_3_13.uasset differ diff --git a/Content/assets/Meshes/SM_Wall_3_14.uasset b/Content/assets/Meshes/SM_Wall_3_14.uasset new file mode 100644 index 0000000..36ac447 Binary files /dev/null and b/Content/assets/Meshes/SM_Wall_3_14.uasset differ diff --git a/Content/assets/Meshes/SM_Wall_3_2.uasset b/Content/assets/Meshes/SM_Wall_3_2.uasset new file mode 100644 index 0000000..d760d3c Binary files /dev/null and b/Content/assets/Meshes/SM_Wall_3_2.uasset differ diff --git a/Content/assets/Meshes/SM_Wall_3_3.uasset b/Content/assets/Meshes/SM_Wall_3_3.uasset new file mode 100644 index 0000000..a7aeec4 Binary files /dev/null and b/Content/assets/Meshes/SM_Wall_3_3.uasset differ diff --git a/Content/assets/Meshes/SM_Wall_3_4.uasset b/Content/assets/Meshes/SM_Wall_3_4.uasset new file mode 100644 index 0000000..373dc1f Binary files /dev/null and b/Content/assets/Meshes/SM_Wall_3_4.uasset differ diff --git a/Content/assets/Meshes/SM_Wall_3_5.uasset b/Content/assets/Meshes/SM_Wall_3_5.uasset new file mode 100644 index 0000000..0d6243a Binary files /dev/null and b/Content/assets/Meshes/SM_Wall_3_5.uasset differ diff --git a/Content/assets/Meshes/SM_Wall_3_6.uasset b/Content/assets/Meshes/SM_Wall_3_6.uasset new file mode 100644 index 0000000..f410bc3 Binary files /dev/null and b/Content/assets/Meshes/SM_Wall_3_6.uasset differ diff --git a/Content/assets/Meshes/SM_Wall_3_7.uasset b/Content/assets/Meshes/SM_Wall_3_7.uasset new file mode 100644 index 0000000..1db736b Binary files /dev/null and b/Content/assets/Meshes/SM_Wall_3_7.uasset differ diff --git a/Content/assets/Meshes/SM_Wall_3_8.uasset b/Content/assets/Meshes/SM_Wall_3_8.uasset new file mode 100644 index 0000000..d624903 Binary files /dev/null and b/Content/assets/Meshes/SM_Wall_3_8.uasset differ diff --git a/Content/assets/Meshes/SM_Wall_3_9.uasset b/Content/assets/Meshes/SM_Wall_3_9.uasset new file mode 100644 index 0000000..f46cb55 Binary files /dev/null and b/Content/assets/Meshes/SM_Wall_3_9.uasset differ diff --git a/Content/assets/Meshes/SM_Wall_4_1.uasset b/Content/assets/Meshes/SM_Wall_4_1.uasset new file mode 100644 index 0000000..dada2dd Binary files /dev/null and b/Content/assets/Meshes/SM_Wall_4_1.uasset differ diff --git a/Content/assets/Meshes/SM_Wall_4_10.uasset b/Content/assets/Meshes/SM_Wall_4_10.uasset new file mode 100644 index 0000000..ea3285c Binary files /dev/null and b/Content/assets/Meshes/SM_Wall_4_10.uasset differ diff --git a/Content/assets/Meshes/SM_Wall_4_11.uasset b/Content/assets/Meshes/SM_Wall_4_11.uasset new file mode 100644 index 0000000..a88f69a Binary files /dev/null and b/Content/assets/Meshes/SM_Wall_4_11.uasset differ diff --git a/Content/assets/Meshes/SM_Wall_4_12.uasset b/Content/assets/Meshes/SM_Wall_4_12.uasset new file mode 100644 index 0000000..2bb2e2a Binary files /dev/null and b/Content/assets/Meshes/SM_Wall_4_12.uasset differ diff --git a/Content/assets/Meshes/SM_Wall_4_13.uasset b/Content/assets/Meshes/SM_Wall_4_13.uasset new file mode 100644 index 0000000..9312f85 Binary files /dev/null and b/Content/assets/Meshes/SM_Wall_4_13.uasset differ diff --git a/Content/assets/Meshes/SM_Wall_4_14.uasset b/Content/assets/Meshes/SM_Wall_4_14.uasset new file mode 100644 index 0000000..992174f Binary files /dev/null and b/Content/assets/Meshes/SM_Wall_4_14.uasset differ diff --git a/Content/assets/Meshes/SM_Wall_4_2.uasset b/Content/assets/Meshes/SM_Wall_4_2.uasset new file mode 100644 index 0000000..f2ab6b6 Binary files /dev/null and b/Content/assets/Meshes/SM_Wall_4_2.uasset differ diff --git a/Content/assets/Meshes/SM_Wall_4_3.uasset b/Content/assets/Meshes/SM_Wall_4_3.uasset new file mode 100644 index 0000000..c2d726d Binary files /dev/null and b/Content/assets/Meshes/SM_Wall_4_3.uasset differ diff --git a/Content/assets/Meshes/SM_Wall_4_4.uasset b/Content/assets/Meshes/SM_Wall_4_4.uasset new file mode 100644 index 0000000..632e8b6 Binary files /dev/null and b/Content/assets/Meshes/SM_Wall_4_4.uasset differ diff --git a/Content/assets/Meshes/SM_Wall_4_5.uasset b/Content/assets/Meshes/SM_Wall_4_5.uasset new file mode 100644 index 0000000..812a376 Binary files /dev/null and b/Content/assets/Meshes/SM_Wall_4_5.uasset differ diff --git a/Content/assets/Meshes/SM_Wall_4_6.uasset b/Content/assets/Meshes/SM_Wall_4_6.uasset new file mode 100644 index 0000000..27fdbb2 Binary files /dev/null and b/Content/assets/Meshes/SM_Wall_4_6.uasset differ diff --git a/Content/assets/Meshes/SM_Wall_4_7.uasset b/Content/assets/Meshes/SM_Wall_4_7.uasset new file mode 100644 index 0000000..d21dc78 Binary files /dev/null and b/Content/assets/Meshes/SM_Wall_4_7.uasset differ diff --git a/Content/assets/Meshes/SM_Wall_4_8.uasset b/Content/assets/Meshes/SM_Wall_4_8.uasset new file mode 100644 index 0000000..d0c1ab5 Binary files /dev/null and b/Content/assets/Meshes/SM_Wall_4_8.uasset differ diff --git a/Content/assets/Meshes/SM_Wall_4_9.uasset b/Content/assets/Meshes/SM_Wall_4_9.uasset new file mode 100644 index 0000000..7350827 Binary files /dev/null and b/Content/assets/Meshes/SM_Wall_4_9.uasset differ diff --git a/Content/assets/Meshes/SM_WardRobe_1A.uasset b/Content/assets/Meshes/SM_WardRobe_1A.uasset new file mode 100644 index 0000000..0ff3676 Binary files /dev/null and b/Content/assets/Meshes/SM_WardRobe_1A.uasset differ diff --git a/Content/assets/Meshes/SM_WardRobe_1B.uasset b/Content/assets/Meshes/SM_WardRobe_1B.uasset new file mode 100644 index 0000000..6019c12 Binary files /dev/null and b/Content/assets/Meshes/SM_WardRobe_1B.uasset differ diff --git a/Content/assets/Meshes/SM_WardRobe_2A.uasset b/Content/assets/Meshes/SM_WardRobe_2A.uasset new file mode 100644 index 0000000..c4ee0e0 Binary files /dev/null and b/Content/assets/Meshes/SM_WardRobe_2A.uasset differ diff --git a/Content/assets/Meshes/SM_WardRobe_2B.uasset b/Content/assets/Meshes/SM_WardRobe_2B.uasset new file mode 100644 index 0000000..424ca01 Binary files /dev/null and b/Content/assets/Meshes/SM_WardRobe_2B.uasset differ diff --git a/Content/assets/Meshes/SM_Wash_Basin.uasset b/Content/assets/Meshes/SM_Wash_Basin.uasset new file mode 100644 index 0000000..a8ae2d5 Binary files /dev/null and b/Content/assets/Meshes/SM_Wash_Basin.uasset differ diff --git a/Content/assets/Meshes/SM_Window_1A.uasset b/Content/assets/Meshes/SM_Window_1A.uasset new file mode 100644 index 0000000..ef998e1 Binary files /dev/null and b/Content/assets/Meshes/SM_Window_1A.uasset differ diff --git a/Content/assets/Meshes/SM_Window_1B.uasset b/Content/assets/Meshes/SM_Window_1B.uasset new file mode 100644 index 0000000..5319279 Binary files /dev/null and b/Content/assets/Meshes/SM_Window_1B.uasset differ diff --git a/Content/assets/Meshes/SM_Window_2A.uasset b/Content/assets/Meshes/SM_Window_2A.uasset new file mode 100644 index 0000000..8453015 Binary files /dev/null and b/Content/assets/Meshes/SM_Window_2A.uasset differ diff --git a/Content/assets/Meshes/SM_Window_2B.uasset b/Content/assets/Meshes/SM_Window_2B.uasset new file mode 100644 index 0000000..285e37b Binary files /dev/null and b/Content/assets/Meshes/SM_Window_2B.uasset differ diff --git a/Content/assets/Meshes/SM_Window_3A.uasset b/Content/assets/Meshes/SM_Window_3A.uasset new file mode 100644 index 0000000..a701a04 Binary files /dev/null and b/Content/assets/Meshes/SM_Window_3A.uasset differ diff --git a/Content/assets/Meshes/SM_Window_3B.uasset b/Content/assets/Meshes/SM_Window_3B.uasset new file mode 100644 index 0000000..6572484 Binary files /dev/null and b/Content/assets/Meshes/SM_Window_3B.uasset differ diff --git a/Content/assets/Meshes/SM_Window_4A.uasset b/Content/assets/Meshes/SM_Window_4A.uasset new file mode 100644 index 0000000..64b4b8b Binary files /dev/null and b/Content/assets/Meshes/SM_Window_4A.uasset differ diff --git a/Content/assets/Meshes/SM_Window_4B.uasset b/Content/assets/Meshes/SM_Window_4B.uasset new file mode 100644 index 0000000..a8d51d2 Binary files /dev/null and b/Content/assets/Meshes/SM_Window_4B.uasset differ diff --git a/Content/assets/Meshes/SM_Window_5A.uasset b/Content/assets/Meshes/SM_Window_5A.uasset new file mode 100644 index 0000000..5642529 Binary files /dev/null and b/Content/assets/Meshes/SM_Window_5A.uasset differ diff --git a/Content/assets/Meshes/SM_Window_5B.uasset b/Content/assets/Meshes/SM_Window_5B.uasset new file mode 100644 index 0000000..b727ecd Binary files /dev/null and b/Content/assets/Meshes/SM_Window_5B.uasset differ diff --git a/Content/assets/Meshes/SM_Window_6.uasset b/Content/assets/Meshes/SM_Window_6.uasset new file mode 100644 index 0000000..302733f Binary files /dev/null and b/Content/assets/Meshes/SM_Window_6.uasset differ diff --git a/Content/assets/OtherMaterials/M_Texture_Atlas.uasset b/Content/assets/OtherMaterials/M_Texture_Atlas.uasset new file mode 100644 index 0000000..ab96da7 Binary files /dev/null and b/Content/assets/OtherMaterials/M_Texture_Atlas.uasset differ diff --git a/Content/assets/OtherTextures/Texture_Atlas.uasset b/Content/assets/OtherTextures/Texture_Atlas.uasset new file mode 100644 index 0000000..3d42686 Binary files /dev/null and b/Content/assets/OtherTextures/Texture_Atlas.uasset differ diff --git a/Content/maps/test_map.umap b/Content/maps/test_map.umap index 7a6dd97..59b32ae 100644 Binary files a/Content/maps/test_map.umap and b/Content/maps/test_map.umap differ diff --git a/Source/WBIF/Private/BaseItem.cpp b/Source/WBIF/Private/BaseItem.cpp index 0da2e08..14114fe 100644 --- a/Source/WBIF/Private/BaseItem.cpp +++ b/Source/WBIF/Private/BaseItem.cpp @@ -3,6 +3,7 @@ #include "BaseItem.h" #include "Female.h" +#include "Math/UnrealMathUtility.h" // Sets default values ABaseItem::ABaseItem() @@ -50,29 +51,23 @@ void ABaseItem::OnOverlapEnd(UPrimitiveComponent* OverlappedComp, AActor* OtherA - - // =======================start used item====================================== void ABaseItem::logicOfUsingItems() { - - UE_LOG(LogTemp, Warning, TEXT("ITEM -> logick1")); if (!used && !isBroken) { - UE_LOG(LogTemp, Warning, TEXT("ITEM -> logick2")); used = !used; // check for breakage if (isCrushed()) { - UE_LOG(LogTemp, Warning, TEXT("ITEM -> logick3")); Health = 0.0f; + female->CheckingUpset(); showBroken(); } else { // TODO ответ бабе что бы она начала анимацию работы female->SartAnimUseItem(); - UE_LOG(LogTemp, Warning, TEXT("ITEM -> logick4")); //EndUseItem(); } } @@ -139,6 +134,21 @@ float ABaseItem::getMaxHealth() return MaxHealth; } +float ABaseItem::GetXMood() +{ + return XMood; +} + +float ABaseItem::GetWeight() +{ + return weight; +} + +void ABaseItem::SetUseItem(bool isUse) +{ + used = isUse; +} + // Called every frame /* diff --git a/Source/WBIF/Private/Female.cpp b/Source/WBIF/Private/Female.cpp index e7884e3..ede2454 100644 --- a/Source/WBIF/Private/Female.cpp +++ b/Source/WBIF/Private/Female.cpp @@ -3,6 +3,7 @@ #include "Female.h" #include "TimerManager.h" +#include "Math/UnrealMathUtility.h" // Sets default values AFemale::AFemale() @@ -11,6 +12,7 @@ AFemale::AFemale() //PrimaryActorTick.bCanEverTick = true; } + // Called when the game starts or when spawned void AFemale::BeginPlay() { @@ -19,8 +21,17 @@ void AFemale::BeginPlay() capsule = GetCapsuleComponent(); capsule->OnComponentBeginOverlap.AddDynamic(this, &AFemale::OnOverlapBegin); capsule->OnComponentEndOverlap.AddDynamic(this, &AFemale::OnOverlapEnd); + maxMood = 0.0f; + currentMood = 0.0f; + GetData(); } +void AFemale::GetData() +{ + gameInstance = Cast(GetGameInstance()); + maxMood = gameInstance->getMaxMood(); + currentMood = gameInstance->getCurrentMood(); +} void AFemale::OnOverlapBegin(UPrimitiveComponent* OverlappedComp, AActor* OtherActor, @@ -43,16 +54,53 @@ void AFemale::OnOverlapBegin(UPrimitiveComponent* OverlappedComp, AActor* OtherA void AFemale::OnOverlapEnd(UPrimitiveComponent* OverlappedComp, AActor* OtherActor, UPrimitiveComponent* OtherComp, int32 OtherBodyIndex) { + ItemForWork = nullptr; UE_LOG(LogTemp, Warning, TEXT("FEMALE OVERLAP END")); } void AFemale::StartUseItem() { - ItemForWork->logicOfUsingItems(); GetWorldTimerManager().ClearTimer(MemberTimerHandle); + if(ItemForWork != nullptr && !ItemForWork->isBroken ) + { + if(!ItemForWork->used) + { + ItemForWork->logicOfUsingItems(); + } + else + { + CheckingUpset(); + } + }else + { + CheckingUpset(); + } + + } +// ============= MOOD ========== +void AFemale::CheckingUpset() +{ + if (!(FMath::RandRange(0.0f, 100.0f) > ItemForWork->GetXMood())) + { + MoodDecreace(); + } +} + +void AFemale::MoodDecreace() +{ + + gameInstance->setCurrentMood(gameInstance->getCurrentMood() - ItemForWork->GetWeight()); +} + +void AFemale::MoodIncreace() +{ +} + + + void AFemale::EndUseItem_Implementation() { @@ -85,4 +133,3 @@ void AFemale::SetupPlayerInputComponent(UInputComponent* PlayerInputComponent) } - diff --git a/Source/WBIF/Public/BaseItem.h b/Source/WBIF/Public/BaseItem.h index e495be9..982c3b1 100644 --- a/Source/WBIF/Public/BaseItem.h +++ b/Source/WBIF/Public/BaseItem.h @@ -6,7 +6,6 @@ #include "GameFramework/Actor.h" #include "Components/StaticMeshComponent.h" #include "Components/BoxComponent.h" -#include "Math/UnrealMathUtility.h" #include "BaseItem.generated.h" UCLASS() @@ -86,4 +85,10 @@ public: float getHealth(); UFUNCTION() float getMaxHealth(); + UFUNCTION() + float GetXMood(); + UFUNCTION() + float GetWeight(); + UFUNCTION() + void SetUseItem(bool isUse); }; diff --git a/Source/WBIF/Public/Female.h b/Source/WBIF/Public/Female.h index 9b33c2a..a79b665 100644 --- a/Source/WBIF/Public/Female.h +++ b/Source/WBIF/Public/Female.h @@ -8,6 +8,7 @@ #include "BaseItem.h" #include "GameFramework/GameMode.h" #include "WBIF/WBIFGameModeBase.h" +#include "WBIFGameInstance.h" #include "Female.generated.h" UCLASS() @@ -35,7 +36,13 @@ protected: void StartUseItem(); UFUNCTION(BlueprintNativeEvent, BlueprintCallable, Category = "Functions") void whatShouldIDo(); - + UFUNCTION(BlueprintCallable, Category = "Mood") + void MoodDecreace(); + UFUNCTION(BlueprintCallable, Category = "Mood") + void MoodIncreace(); + + UFUNCTION() + void GetData(); // ===================Variable=================================== UPROPERTY(EditAnyWhere, Category = "Data") @@ -45,6 +52,8 @@ protected: UCapsuleComponent* capsule; UPROPERTY(EditAnyWhere, BlueprintReadWrite, Category = "Data") FName NameItem; + UPROPERTY(EditAnyWhere, BlueprintReadWrite, Category= "Data") + UWBIFGameInstance* gameInstance; @@ -60,6 +69,8 @@ public: void SartAnimUseItem(); UFUNCTION(BlueprintCallable, BlueprintNativeEvent, Category = "Use Item") void EndUseItem(); + UFUNCTION(BlueprintCallable, Category = "Mood") + void CheckingUpset(); // ===================Variable=================================== UPROPERTY() // variable for timer