Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adding tool belt #1349

Merged
merged 28 commits into from
Dec 2, 2023
Merged
Changes from 1 commit
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
4fb4e82
Add belt container and slot
stilnat Nov 20, 2023
133a374
add toolbelt item
stilnat Nov 20, 2023
91d8707
put toolbelt on
stilnat Nov 20, 2023
b50e10e
add storage conditions
stilnat Nov 21, 2023
c8e2f4e
add storage condition components
stilnat Nov 21, 2023
0dcb855
Merge branch 'develop' into adding-belt
stilnat Nov 23, 2023
0e10dca
try to fix assets stuff
stilnat Nov 23, 2023
5f15462
remove body part database
stilnat Nov 23, 2023
193ce48
fix merge issues
stilnat Nov 23, 2023
4e4826e
readd toolbelt
stilnat Nov 23, 2023
ac9d788
some set up on human prefab
stilnat Nov 24, 2023
d78e9bb
add storage condition in can contain on attached containers
stilnat Nov 24, 2023
829b168
doc
stilnat Nov 24, 2023
61dca75
fix build
stilnat Nov 24, 2023
891b609
put toolbelt on item layer
stilnat Nov 24, 2023
1cf3bb3
update slot size
stilnat Nov 26, 2023
115b915
simplify container stuff
stilnat Nov 27, 2023
d807d58
simplify checks
stilnat Nov 27, 2023
fc31ce8
add transfer item method
stilnat Nov 27, 2023
dd63dfc
renamed clothes folder to clothing and moving backpack and toolbelt i…
stilnat Nov 27, 2023
32795ec
remove old toolbelt
stilnat Nov 28, 2023
0b723c4
readd toolbelt to database
stilnat Nov 29, 2023
fb6640d
fix toolbelt asset
stilnat Nov 29, 2023
c86af32
fix item prefabs
stilnat Nov 29, 2023
cb7cb60
added some condition regarding removing items using UI
stilnat Nov 29, 2023
20ac48e
add backpack back
stilnat Nov 29, 2023
c76f81e
Merge branch 'develop' into adding-belt
stilnat Dec 2, 2023
68302d6
fix merge stuff
stilnat Dec 2, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
remove body part database
stilnat committed Nov 23, 2023
commit 5f1546281ff82a00e96ea940c290721949ad8f9b
1 change: 0 additions & 1 deletion Assets/Content/Addressables/AddressableAssetSettings.asset
Original file line number Diff line number Diff line change
@@ -47,7 +47,6 @@ MonoBehaviour:
- {fileID: 11400000, guid: 8e95016540bf27c4eb11580ec096568a, type: 2}
- {fileID: 11400000, guid: 9bfbc9d4c2c1bb944942108648547da2, type: 2}
- {fileID: 11400000, guid: bacca0c47905ef441803065410c8978e, type: 2}
- {fileID: 11400000, guid: ee54898534212cd4a97b528a9d620c75, type: 2}
- {fileID: 11400000, guid: ead2cce9e35a7304ab5b8cc67d03347b, type: 2}
- {fileID: 11400000, guid: dd394b793b56e43418a2c11a61130663, type: 2}
- {fileID: 11400000, guid: d640c8e212e7a5349999a9ddd6ffb5b5, type: 2}
105 changes: 0 additions & 105 deletions Assets/Content/Addressables/AssetGroups/BodyParts.asset

This file was deleted.

81 changes: 81 additions & 0 deletions Assets/Content/Addressables/AssetGroups/Items.asset
Original file line number Diff line number Diff line change
@@ -193,8 +193,89 @@ MonoBehaviour:
m_Address: Assets/Content/WorldObjects/Items/Clothes/HeadsetRight.prefab
m_ReadOnly: 0
m_SerializedLabels: []
<<<<<<< Updated upstream
- m_GUID: 8fabaf8ecfcd66a43a5b3fe2cefea719
m_Address: Assets/Content/WorldObjects/Items/Functional/Storage/Objects/Toolbelt.prefab
=======
- m_GUID: 06b6be83779804245b7f6411fe07b851
m_Address: Assets/Content/WorldObjects/Entities/Humanoids/Human/HumanBodyParts/HumanArmLeft.prefab
m_ReadOnly: 0
m_SerializedLabels: []
- m_GUID: 432a4ad70e41e5c4f8f913f76fe0e66c
m_Address: Assets/Content/WorldObjects/Entities/Humanoids/Human/HumanBodyParts/HumanArmRight.prefab
m_ReadOnly: 0
m_SerializedLabels: []
- m_GUID: e02f11b9239b52748a5ed5afd1c5cbd3
m_Address: Assets/Content/WorldObjects/Entities/Humanoids/Human/HumanBodyParts/HumanEarLeft.prefab
m_ReadOnly: 0
m_SerializedLabels: []
- m_GUID: 30794a01d5f4c174a9d20b2c632f2dca
m_Address: Assets/Content/WorldObjects/Entities/Humanoids/Human/HumanBodyParts/HumanEarRight.prefab
m_ReadOnly: 0
m_SerializedLabels: []
- m_GUID: 94aaf82bb6ab002418e01d9cc7c6eaaa
m_Address: Assets/Content/WorldObjects/Entities/Humanoids/Human/HumanBodyParts/HumanFootLeft.prefab
m_ReadOnly: 0
m_SerializedLabels: []
- m_GUID: e60ba1e09be8316448e419ecbdfb64a6
m_Address: Assets/Content/WorldObjects/Entities/Humanoids/Human/HumanBodyParts/HumanFootRight.prefab
m_ReadOnly: 0
m_SerializedLabels: []
- m_GUID: 35dfc7c3f708a5b48a206b4a44e7ab49
m_Address: Assets/Content/WorldObjects/Entities/Humanoids/Human/HumanBodyParts/HumanHandLeft.prefab
m_ReadOnly: 0
m_SerializedLabels: []
- m_GUID: 7f5954f009d06b2439ca637b43920440
m_Address: Assets/Content/WorldObjects/Entities/Humanoids/Human/HumanBodyParts/HumanHandRight.prefab
m_ReadOnly: 0
m_SerializedLabels: []
- m_GUID: cc54bc74b2f4c2349b1f84b501b0a091
m_Address: Assets/Content/WorldObjects/Entities/Humanoids/Human/HumanBodyParts/HumanHead.prefab
m_ReadOnly: 0
m_SerializedLabels: []
- m_GUID: ecaf79b0a74bdb443a350e88daa94a66
m_Address: Assets/Content/WorldObjects/Entities/Humanoids/Human/HumanBodyParts/HumanLegLeft.prefab
m_ReadOnly: 0
m_SerializedLabels: []
- m_GUID: 4a9d34a6cf84ef045a740513d8ae30b1
m_Address: Assets/Content/WorldObjects/Entities/Humanoids/Human/HumanBodyParts/HumanTorso.prefab
m_ReadOnly: 0
m_SerializedLabels: []
- m_GUID: 242a937784a622f4f8a6e6d097e0737c
m_Address: Assets/Content/WorldObjects/Entities/Humanoids/Human/HumanBodyParts/HumanLegRight.prefab
m_ReadOnly: 0
m_SerializedLabels: []
- m_GUID: a8b265034e3f79344a6067b406e1bff6
m_Address: Assets/Content/WorldObjects/Entities/Humanoids/Human/HumanOrgans/HumanLungRight.prefab
m_ReadOnly: 0
m_SerializedLabels: []
- m_GUID: a019475d05ec8824494b0fa88e2282d8
m_Address: Assets/Content/WorldObjects/Entities/Humanoids/Human/HumanOrgans/HumanLungLeft.prefab
m_ReadOnly: 0
m_SerializedLabels: []
- m_GUID: 2bc6f6a968d5ba04c919ba56d0ccdab4
m_Address: Assets/Content/WorldObjects/Entities/Humanoids/Human/HumanOrgans/HumanStomach.prefab
m_ReadOnly: 0
m_SerializedLabels: []
- m_GUID: d75ff9a3ac207a84487ec1ee73a676fc
m_Address: Assets/Content/WorldObjects/Entities/Humanoids/Human/HumanOrgans/HumanLiver.prefab
m_ReadOnly: 0
m_SerializedLabels: []
- m_GUID: ea5b9b571f8df3948b52b7023aa66c99
m_Address: Assets/Content/WorldObjects/Entities/Humanoids/Human/HumanOrgans/HumanHeart.prefab
m_ReadOnly: 0
m_SerializedLabels: []
- m_GUID: 1e304f9a331c2ba419514ef8afb8a13c
m_Address: Assets/Content/WorldObjects/Entities/Humanoids/Human/HumanOrgans/HumanIntestineLarge.prefab
m_ReadOnly: 0
m_SerializedLabels: []
- m_GUID: 071581df025e1ba49a8a75eb39611ff6
m_Address: Assets/Content/WorldObjects/Entities/Humanoids/Human/HumanOrgans/HumanEye.prefab
m_ReadOnly: 0
m_SerializedLabels: []
- m_GUID: 7579883b8dd8801448a176adace4860b
m_Address: Assets/Content/WorldObjects/Entities/Humanoids/Human/HumanOrgans/HumanBrain.prefab
>>>>>>> Stashed changes
m_ReadOnly: 0
m_SerializedLabels: []
m_ReadOnly: 0

This file was deleted.

This file was deleted.

This file was deleted.

38 changes: 0 additions & 38 deletions Assets/Content/Data/BodyParts.asset

This file was deleted.

8 changes: 0 additions & 8 deletions Assets/Content/Data/BodyParts.asset.meta

This file was deleted.

23 changes: 23 additions & 0 deletions Assets/Content/Data/Items.asset
Original file line number Diff line number Diff line change
@@ -60,4 +60,27 @@ MonoBehaviour:
- {fileID: 726792282085660869, guid: 4635651592391df41b6b2413afdb76c3, type: 3}
- {fileID: 7723921361698481624, guid: f549f4153ef612c4586c46ea280e0e94, type: 3}
- {fileID: 8712940276313799639, guid: 1a2f912be4bc1b948a2b22ffde517cdc, type: 3}
<<<<<<< Updated upstream
- {fileID: 1080889307602868191, guid: 8fabaf8ecfcd66a43a5b3fe2cefea719, type: 3}
=======
- {fileID: 1888615333292121711, guid: 06b6be83779804245b7f6411fe07b851, type: 3}
- {fileID: 832941577213411195, guid: 432a4ad70e41e5c4f8f913f76fe0e66c, type: 3}
- {fileID: 3861326785315191697, guid: e02f11b9239b52748a5ed5afd1c5cbd3, type: 3}
- {fileID: 3299576395946724586, guid: 30794a01d5f4c174a9d20b2c632f2dca, type: 3}
- {fileID: 6958959792659314810, guid: 94aaf82bb6ab002418e01d9cc7c6eaaa, type: 3}
- {fileID: 6632297082311541152, guid: e60ba1e09be8316448e419ecbdfb64a6, type: 3}
- {fileID: 2207730063960764759, guid: 35dfc7c3f708a5b48a206b4a44e7ab49, type: 3}
- {fileID: 7546631754298856378, guid: 7f5954f009d06b2439ca637b43920440, type: 3}
- {fileID: 8006468508714419156, guid: cc54bc74b2f4c2349b1f84b501b0a091, type: 3}
- {fileID: 3470038122221450171, guid: ecaf79b0a74bdb443a350e88daa94a66, type: 3}
- {fileID: 5562010227207703736, guid: 4a9d34a6cf84ef045a740513d8ae30b1, type: 3}
- {fileID: 8256619991674398311, guid: 242a937784a622f4f8a6e6d097e0737c, type: 3}
- {fileID: 8304480218026041231, guid: a8b265034e3f79344a6067b406e1bff6, type: 3}
- {fileID: 1705603677127675533, guid: a019475d05ec8824494b0fa88e2282d8, type: 3}
- {fileID: 5774385816057912484, guid: 2bc6f6a968d5ba04c919ba56d0ccdab4, type: 3}
- {fileID: 5774385816057912484, guid: d75ff9a3ac207a84487ec1ee73a676fc, type: 3}
- {fileID: 2302397424301738637, guid: ea5b9b571f8df3948b52b7023aa66c99, type: 3}
- {fileID: 5774385816057912484, guid: 1e304f9a331c2ba419514ef8afb8a13c, type: 3}
- {fileID: 5774385816057912484, guid: 071581df025e1ba49a8a75eb39611ff6, type: 3}
- {fileID: 5774385816057912484, guid: 7579883b8dd8801448a176adace4860b, type: 3}
>>>>>>> Stashed changes

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 8 additions & 9 deletions Assets/Scripts/SS3D/Data/Enums/AssetDatabases.cs
Original file line number Diff line number Diff line change
@@ -2,15 +2,14 @@ namespace SS3D.Data.Enums
{
public enum AssetDatabases
{
BodyParts = 0,
CraftingRecipes = 1,
InteractionIcons = 2,
Items = 3,
ParticlesEffects = 4,
Scenes = 5,
Settings = 6,
Sounds = 7,
UIElements = 8,
CraftingRecipes = 0,
InteractionIcons = 1,
Items = 2,
ParticlesEffects = 3,
Scenes = 4,
Settings = 5,
Sounds = 6,
UIElements = 7,
}
}

Loading