Merge remote-tracking branch 'origin/inventory' into feature/farming_visuals
# Conflicts: # art/animation/Vesna2D/Vesna Anims Tools/B01-Idle-Gießkanne/0001.png.import # art/animation/Vesna2D/Vesna Anims Tools/B01-Idle-Gießkanne/0002.png.import # art/animation/Vesna2D/Vesna Anims Tools/B01-Idle-Gießkanne/0003.png.import # art/animation/Vesna2D/Vesna Anims Tools/B01-Idle-Gießkanne/0004.png.import # art/animation/Vesna2D/Vesna Anims Tools/B01-Idle-Gießkanne/0005.png.import # art/animation/Vesna2D/Vesna Anims Tools/B01-Idle-Gießkanne/0006.png.import # art/animation/Vesna2D/Vesna Anims Tools/B01-Idle-Gießkanne/0007.png.import # art/animation/Vesna2D/Vesna Anims Tools/B01-Idle-Gießkanne/0008.png.import # art/animation/Vesna2D/Vesna Anims Tools/B01-Idle-Gießkanne/0009.png.import # art/animation/Vesna2D/Vesna Anims Tools/B01-Idle-Gießkanne/0010.png.import # art/animation/Vesna2D/Vesna Anims Tools/B01-Idle-Gießkanne/0011.png.import # art/animation/Vesna2D/Vesna Anims Tools/B01-Idle-Gießkanne/0012.png.import # art/animation/Vesna2D/Vesna Anims Tools/B01-Idle-Gießkanne/0013.png.import # art/animation/Vesna2D/Vesna Anims Tools/B01-Idle-Gießkanne/0014.png.import # art/animation/Vesna2D/Vesna Anims Tools/B01-Idle-Gießkanne/0015.png.import # art/animation/Vesna2D/Vesna Anims Tools/B01-Idle-Gießkanne/0016.png.import # art/animation/Vesna2D/Vesna Anims Tools/B01-Idle-Gießkanne/0017.png.import # art/animation/Vesna2D/Vesna Anims Tools/B01-Idle-Gießkanne/0018.png.import # art/animation/Vesna2D/Vesna Anims Tools/B01-Idle-Gießkanne/0019.png.import # art/animation/Vesna2D/Vesna Anims Tools/B01-Idle-Gießkanne/0020.png.import # art/animation/Vesna2D/Vesna Anims Tools/B01-Idle-Harke/0001.png.import # art/animation/Vesna2D/Vesna Anims Tools/B01-Idle-Harke/0002.png.import # art/animation/Vesna2D/Vesna Anims Tools/B01-Idle-Harke/0003.png.import # art/animation/Vesna2D/Vesna Anims Tools/B01-Idle-Harke/0004.png.import # art/animation/Vesna2D/Vesna Anims Tools/B01-Idle-Harke/0005.png.import # art/animation/Vesna2D/Vesna Anims Tools/B01-Idle-Harke/0006.png.import # art/animation/Vesna2D/Vesna Anims Tools/B01-Idle-Harke/0007.png.import # art/animation/Vesna2D/Vesna Anims Tools/B01-Idle-Harke/0008.png.import # art/animation/Vesna2D/Vesna Anims Tools/B01-Idle-Harke/0009.png.import # art/animation/Vesna2D/Vesna Anims Tools/B01-Idle-Harke/0010.png.import # art/animation/Vesna2D/Vesna Anims Tools/B01-Idle-Harke/0011.png.import # art/animation/Vesna2D/Vesna Anims Tools/B01-Idle-Harke/0012.png.import # art/animation/Vesna2D/Vesna Anims Tools/B01-Idle-Harke/0013.png.import # art/animation/Vesna2D/Vesna Anims Tools/B01-Idle-Harke/0014.png.import # art/animation/Vesna2D/Vesna Anims Tools/B01-Idle-Harke/0015.png.import # art/animation/Vesna2D/Vesna Anims Tools/B01-Idle-Harke/0016.png.import # art/animation/Vesna2D/Vesna Anims Tools/B01-Idle-Harke/0017.png.import # art/animation/Vesna2D/Vesna Anims Tools/B01-Idle-Harke/0018.png.import # art/animation/Vesna2D/Vesna Anims Tools/B01-Idle-Harke/0019.png.import # art/animation/Vesna2D/Vesna Anims Tools/B01-Idle-Harke/0020.png.import # art/animation/Vesna2D/Vesna Anims Tools/B02-Walk-Gießkanne/0001.png.import # art/animation/Vesna2D/Vesna Anims Tools/B02-Walk-Gießkanne/0002.png.import # art/animation/Vesna2D/Vesna Anims Tools/B02-Walk-Gießkanne/0003.png.import # art/animation/Vesna2D/Vesna Anims Tools/B02-Walk-Gießkanne/0004.png.import # art/animation/Vesna2D/Vesna Anims Tools/B02-Walk-Gießkanne/0005.png.import # art/animation/Vesna2D/Vesna Anims Tools/B02-Walk-Gießkanne/0006.png.import # art/animation/Vesna2D/Vesna Anims Tools/B02-Walk-Gießkanne/0007.png.import # art/animation/Vesna2D/Vesna Anims Tools/B02-Walk-Gießkanne/0008.png.import # art/animation/Vesna2D/Vesna Anims Tools/B02-Walk-Gießkanne/0009.png.import # art/animation/Vesna2D/Vesna Anims Tools/B02-Walk-Gießkanne/0010.png.import # art/animation/Vesna2D/Vesna Anims Tools/B02-Walk-Gießkanne/0011.png.import # art/animation/Vesna2D/Vesna Anims Tools/B02-Walk-Gießkanne/0012.png.import # art/animation/Vesna2D/Vesna Anims Tools/B02-Walk-Gießkanne/0013.png.import # art/animation/Vesna2D/Vesna Anims Tools/B02-Walk-Gießkanne/0014.png.import # art/animation/Vesna2D/Vesna Anims Tools/B02-Walk-Gießkanne/0015.png.import # art/animation/Vesna2D/Vesna Anims Tools/B02-Walk-Gießkanne/0016.png.import # art/animation/Vesna2D/Vesna Anims Tools/B02-Walk-Gießkanne/0017.png.import # art/animation/Vesna2D/Vesna Anims Tools/B02-Walk-Gießkanne/0018.png.import # art/animation/Vesna2D/Vesna Anims Tools/B02-Walk-Gießkanne/0019.png.import # art/animation/Vesna2D/Vesna Anims Tools/B02-Walk-Gießkanne/0020.png.import # art/animation/Vesna2D/Vesna Anims Tools/B02-Walk-Harke/0001.png.import # art/animation/Vesna2D/Vesna Anims Tools/B02-Walk-Harke/0002.png.import # art/animation/Vesna2D/Vesna Anims Tools/B02-Walk-Harke/0003.png.import # art/animation/Vesna2D/Vesna Anims Tools/B02-Walk-Harke/0004.png.import # art/animation/Vesna2D/Vesna Anims Tools/B02-Walk-Harke/0005.png.import # art/animation/Vesna2D/Vesna Anims Tools/B02-Walk-Harke/0006.png.import # art/animation/Vesna2D/Vesna Anims Tools/B02-Walk-Harke/0007.png.import # art/animation/Vesna2D/Vesna Anims Tools/B02-Walk-Harke/0008.png.import # art/animation/Vesna2D/Vesna Anims Tools/B02-Walk-Harke/0009.png.import # art/animation/Vesna2D/Vesna Anims Tools/B02-Walk-Harke/0010.png.import # art/animation/Vesna2D/Vesna Anims Tools/B02-Walk-Harke/0011.png.import # art/animation/Vesna2D/Vesna Anims Tools/B02-Walk-Harke/0012.png.import # art/animation/Vesna2D/Vesna Anims Tools/B02-Walk-Harke/0013.png.import # art/animation/Vesna2D/Vesna Anims Tools/B02-Walk-Harke/0014.png.import # art/animation/Vesna2D/Vesna Anims Tools/B02-Walk-Harke/0015.png.import # art/animation/Vesna2D/Vesna Anims Tools/B02-Walk-Harke/0016.png.import # art/animation/Vesna2D/Vesna Anims Tools/B02-Walk-Harke/0017.png.import # art/animation/Vesna2D/Vesna Anims Tools/B02-Walk-Harke/0018.png.import # art/animation/Vesna2D/Vesna Anims Tools/B02-Walk-Harke/0019.png.import # art/animation/Vesna2D/Vesna Anims Tools/B02-Walk-Harke/0020.png.import # art/animation/Vesna2D/Vesna Anims Tools/D01-Idle-Gießkanne/0001.png.import # art/animation/Vesna2D/Vesna Anims Tools/D01-Idle-Gießkanne/0002.png.import # art/animation/Vesna2D/Vesna Anims Tools/D01-Idle-Gießkanne/0003.png.import # art/animation/Vesna2D/Vesna Anims Tools/D01-Idle-Gießkanne/0004.png.import # art/animation/Vesna2D/Vesna Anims Tools/D01-Idle-Gießkanne/0005.png.import # art/animation/Vesna2D/Vesna Anims Tools/D01-Idle-Gießkanne/0006.png.import # art/animation/Vesna2D/Vesna Anims Tools/D01-Idle-Gießkanne/0007.png.import # art/animation/Vesna2D/Vesna Anims Tools/D01-Idle-Gießkanne/0008.png.import # art/animation/Vesna2D/Vesna Anims Tools/D01-Idle-Gießkanne/0009.png.import # art/animation/Vesna2D/Vesna Anims Tools/D01-Idle-Gießkanne/0010.png.import # art/animation/Vesna2D/Vesna Anims Tools/D01-Idle-Gießkanne/0011.png.import # art/animation/Vesna2D/Vesna Anims Tools/D01-Idle-Gießkanne/0012.png.import # art/animation/Vesna2D/Vesna Anims Tools/D01-Idle-Gießkanne/0013.png.import # art/animation/Vesna2D/Vesna Anims Tools/D01-Idle-Gießkanne/0014.png.import # art/animation/Vesna2D/Vesna Anims Tools/D01-Idle-Gießkanne/0015.png.import # art/animation/Vesna2D/Vesna Anims Tools/D01-Idle-Gießkanne/0016.png.import # art/animation/Vesna2D/Vesna Anims Tools/D01-Idle-Gießkanne/0017.png.import # art/animation/Vesna2D/Vesna Anims Tools/D01-Idle-Gießkanne/0018.png.import # art/animation/Vesna2D/Vesna Anims Tools/D01-Idle-Gießkanne/0019.png.import # art/animation/Vesna2D/Vesna Anims Tools/D01-Idle-Gießkanne/0020.png.import # art/animation/Vesna2D/Vesna Anims Tools/D01-Idle-Harke/0001.png.import # art/animation/Vesna2D/Vesna Anims Tools/D01-Idle-Harke/0002.png.import # art/animation/Vesna2D/Vesna Anims Tools/D01-Idle-Harke/0003.png.import # art/animation/Vesna2D/Vesna Anims Tools/D01-Idle-Harke/0004.png.import # art/animation/Vesna2D/Vesna Anims Tools/D01-Idle-Harke/0005.png.import # art/animation/Vesna2D/Vesna Anims Tools/D01-Idle-Harke/0006.png.import # art/animation/Vesna2D/Vesna Anims Tools/D01-Idle-Harke/0007.png.import # art/animation/Vesna2D/Vesna Anims Tools/D01-Idle-Harke/0008.png.import # art/animation/Vesna2D/Vesna Anims Tools/D01-Idle-Harke/0009.png.import # art/animation/Vesna2D/Vesna Anims Tools/D01-Idle-Harke/0010.png.import # art/animation/Vesna2D/Vesna Anims Tools/D01-Idle-Harke/0011.png.import # art/animation/Vesna2D/Vesna Anims Tools/D01-Idle-Harke/0012.png.import # art/animation/Vesna2D/Vesna Anims Tools/D01-Idle-Harke/0013.png.import # art/animation/Vesna2D/Vesna Anims Tools/D01-Idle-Harke/0014.png.import # art/animation/Vesna2D/Vesna Anims Tools/D01-Idle-Harke/0015.png.import # art/animation/Vesna2D/Vesna Anims Tools/D01-Idle-Harke/0016.png.import # art/animation/Vesna2D/Vesna Anims Tools/D01-Idle-Harke/0017.png.import # art/animation/Vesna2D/Vesna Anims Tools/D01-Idle-Harke/0018.png.import # art/animation/Vesna2D/Vesna Anims Tools/D01-Idle-Harke/0019.png.import # art/animation/Vesna2D/Vesna Anims Tools/D01-Idle-Harke/0020.png.import # art/animation/Vesna2D/Vesna Anims Tools/F01-Idle-Gießkanne/0001.png.import # art/animation/Vesna2D/Vesna Anims Tools/F01-Idle-Gießkanne/0002.png.import # art/animation/Vesna2D/Vesna Anims Tools/F01-Idle-Gießkanne/0003.png.import # art/animation/Vesna2D/Vesna Anims Tools/F01-Idle-Gießkanne/0004.png.import # art/animation/Vesna2D/Vesna Anims Tools/F01-Idle-Gießkanne/0005.png.import # art/animation/Vesna2D/Vesna Anims Tools/F01-Idle-Gießkanne/0006.png.import # art/animation/Vesna2D/Vesna Anims Tools/F01-Idle-Gießkanne/0007.png.import # art/animation/Vesna2D/Vesna Anims Tools/F01-Idle-Gießkanne/0008.png.import # art/animation/Vesna2D/Vesna Anims Tools/F01-Idle-Gießkanne/0009.png.import # art/animation/Vesna2D/Vesna Anims Tools/F01-Idle-Gießkanne/0010.png.import # art/animation/Vesna2D/Vesna Anims Tools/F01-Idle-Gießkanne/0011.png.import # art/animation/Vesna2D/Vesna Anims Tools/F01-Idle-Gießkanne/0012.png.import # art/animation/Vesna2D/Vesna Anims Tools/F01-Idle-Gießkanne/0013.png.import # art/animation/Vesna2D/Vesna Anims Tools/F01-Idle-Gießkanne/0014.png.import # art/animation/Vesna2D/Vesna Anims Tools/F01-Idle-Gießkanne/0015.png.import # art/animation/Vesna2D/Vesna Anims Tools/F01-Idle-Gießkanne/0016.png.import # art/animation/Vesna2D/Vesna Anims Tools/F01-Idle-Gießkanne/0017.png.import # art/animation/Vesna2D/Vesna Anims Tools/F01-Idle-Gießkanne/0018.png.import # art/animation/Vesna2D/Vesna Anims Tools/F01-Idle-Gießkanne/0019.png.import # art/animation/Vesna2D/Vesna Anims Tools/F01-Idle-Gießkanne/0020.png.import # art/animation/Vesna2D/Vesna Anims Tools/F01-Idle-Harke/0001.png.import # art/animation/Vesna2D/Vesna Anims Tools/F01-Idle-Harke/0002.png.import # art/animation/Vesna2D/Vesna Anims Tools/F01-Idle-Harke/0003.png.import # art/animation/Vesna2D/Vesna Anims Tools/F01-Idle-Harke/0004.png.import # art/animation/Vesna2D/Vesna Anims Tools/F01-Idle-Harke/0005.png.import # art/animation/Vesna2D/Vesna Anims Tools/F01-Idle-Harke/0006.png.import # art/animation/Vesna2D/Vesna Anims Tools/F01-Idle-Harke/0007.png.import # art/animation/Vesna2D/Vesna Anims Tools/F01-Idle-Harke/0008.png.import # art/animation/Vesna2D/Vesna Anims Tools/F01-Idle-Harke/0009.png.import # art/animation/Vesna2D/Vesna Anims Tools/F01-Idle-Harke/0010.png.import # art/animation/Vesna2D/Vesna Anims Tools/F01-Idle-Harke/0011.png.import # art/animation/Vesna2D/Vesna Anims Tools/F01-Idle-Harke/0012.png.import # art/animation/Vesna2D/Vesna Anims Tools/F01-Idle-Harke/0013.png.import # art/animation/Vesna2D/Vesna Anims Tools/F01-Idle-Harke/0014.png.import # art/animation/Vesna2D/Vesna Anims Tools/F01-Idle-Harke/0015.png.import # art/animation/Vesna2D/Vesna Anims Tools/F01-Idle-Harke/0016.png.import # art/animation/Vesna2D/Vesna Anims Tools/F01-Idle-Harke/0017.png.import # art/animation/Vesna2D/Vesna Anims Tools/F01-Idle-Harke/0018.png.import # art/animation/Vesna2D/Vesna Anims Tools/F01-Idle-Harke/0019.png.import # art/animation/Vesna2D/Vesna Anims Tools/F01-Idle-Harke/0020.png.import # art/animation/Vesna2D/Vesna Anims Tools/F02-Walk-Gießkanne/0001.png.import # art/animation/Vesna2D/Vesna Anims Tools/F02-Walk-Gießkanne/0002.png.import # art/animation/Vesna2D/Vesna Anims Tools/F02-Walk-Gießkanne/0003.png.import # art/animation/Vesna2D/Vesna Anims Tools/F02-Walk-Gießkanne/0004.png.import # art/animation/Vesna2D/Vesna Anims Tools/F02-Walk-Gießkanne/0005.png.import # art/animation/Vesna2D/Vesna Anims Tools/F02-Walk-Gießkanne/0006.png.import # art/animation/Vesna2D/Vesna Anims Tools/F02-Walk-Gießkanne/0007.png.import # art/animation/Vesna2D/Vesna Anims Tools/F02-Walk-Gießkanne/0008.png.import # art/animation/Vesna2D/Vesna Anims Tools/F02-Walk-Gießkanne/0009.png.import # art/animation/Vesna2D/Vesna Anims Tools/F02-Walk-Gießkanne/0010.png.import # art/animation/Vesna2D/Vesna Anims Tools/F02-Walk-Gießkanne/0011.png.import # art/animation/Vesna2D/Vesna Anims Tools/F02-Walk-Gießkanne/0012.png.import # art/animation/Vesna2D/Vesna Anims Tools/F02-Walk-Gießkanne/0013.png.import # art/animation/Vesna2D/Vesna Anims Tools/F02-Walk-Gießkanne/0014.png.import # art/animation/Vesna2D/Vesna Anims Tools/F02-Walk-Gießkanne/0015.png.import # art/animation/Vesna2D/Vesna Anims Tools/F02-Walk-Gießkanne/0016.png.import # art/animation/Vesna2D/Vesna Anims Tools/F02-Walk-Gießkanne/0017.png.import # art/animation/Vesna2D/Vesna Anims Tools/F02-Walk-Gießkanne/0018.png.import # art/animation/Vesna2D/Vesna Anims Tools/F02-Walk-Gießkanne/0019.png.import # art/animation/Vesna2D/Vesna Anims Tools/F02-Walk-Gießkanne/0020.png.import # art/animation/Vesna2D/Vesna Anims Tools/F02-Walk-Harke/0001.png.import # art/animation/Vesna2D/Vesna Anims Tools/F02-Walk-Harke/0002.png.import # art/animation/Vesna2D/Vesna Anims Tools/F02-Walk-Harke/0003.png.import # art/animation/Vesna2D/Vesna Anims Tools/F02-Walk-Harke/0004.png.import # art/animation/Vesna2D/Vesna Anims Tools/F02-Walk-Harke/0005.png.import # art/animation/Vesna2D/Vesna Anims Tools/F02-Walk-Harke/0006.png.import # art/animation/Vesna2D/Vesna Anims Tools/F02-Walk-Harke/0007.png.import # art/animation/Vesna2D/Vesna Anims Tools/F02-Walk-Harke/0008.png.import # art/animation/Vesna2D/Vesna Anims Tools/F02-Walk-Harke/0009.png.import # art/animation/Vesna2D/Vesna Anims Tools/F02-Walk-Harke/0010.png.import # art/animation/Vesna2D/Vesna Anims Tools/F02-Walk-Harke/0011.png.import # art/animation/Vesna2D/Vesna Anims Tools/F02-Walk-Harke/0012.png.import # art/animation/Vesna2D/Vesna Anims Tools/F02-Walk-Harke/0013.png.import # art/animation/Vesna2D/Vesna Anims Tools/F02-Walk-Harke/0014.png.import # art/animation/Vesna2D/Vesna Anims Tools/F02-Walk-Harke/0015.png.import # art/animation/Vesna2D/Vesna Anims Tools/F02-Walk-Harke/0016.png.import # art/animation/Vesna2D/Vesna Anims Tools/F02-Walk-Harke/0017.png.import # art/animation/Vesna2D/Vesna Anims Tools/F02-Walk-Harke/0018.png.import # art/animation/Vesna2D/Vesna Anims Tools/F02-Walk-Harke/0019.png.import # art/animation/Vesna2D/Vesna Anims Tools/F02-Walk-Harke/0020.png.import # art/animation/Vesna2D/Vesna Anims Tools/S01-Idle-Gießkanne/0001.png.import # art/animation/Vesna2D/Vesna Anims Tools/S01-Idle-Gießkanne/0002.png.import # art/animation/Vesna2D/Vesna Anims Tools/S01-Idle-Gießkanne/0003.png.import # art/animation/Vesna2D/Vesna Anims Tools/S01-Idle-Gießkanne/0004.png.import # art/animation/Vesna2D/Vesna Anims Tools/S01-Idle-Gießkanne/0005.png.import # art/animation/Vesna2D/Vesna Anims Tools/S01-Idle-Gießkanne/0006.png.import # art/animation/Vesna2D/Vesna Anims Tools/S01-Idle-Gießkanne/0007.png.import # art/animation/Vesna2D/Vesna Anims Tools/S01-Idle-Gießkanne/0008.png.import # art/animation/Vesna2D/Vesna Anims Tools/S01-Idle-Gießkanne/0009.png.import # art/animation/Vesna2D/Vesna Anims Tools/S01-Idle-Gießkanne/0010.png.import # art/animation/Vesna2D/Vesna Anims Tools/S01-Idle-Gießkanne/0011.png.import # art/animation/Vesna2D/Vesna Anims Tools/S01-Idle-Gießkanne/0012.png.import # art/animation/Vesna2D/Vesna Anims Tools/S01-Idle-Gießkanne/0013.png.import # art/animation/Vesna2D/Vesna Anims Tools/S01-Idle-Gießkanne/0014.png.import # art/animation/Vesna2D/Vesna Anims Tools/S01-Idle-Gießkanne/0015.png.import # art/animation/Vesna2D/Vesna Anims Tools/S01-Idle-Gießkanne/0016.png.import # art/animation/Vesna2D/Vesna Anims Tools/S01-Idle-Gießkanne/0017.png.import # art/animation/Vesna2D/Vesna Anims Tools/S01-Idle-Gießkanne/0018.png.import # art/animation/Vesna2D/Vesna Anims Tools/S01-Idle-Gießkanne/0019.png.import # art/animation/Vesna2D/Vesna Anims Tools/S01-Idle-Gießkanne/0020.png.import # art/animation/Vesna2D/Vesna Anims Tools/S01-Idle-Harke/0001.png.import # art/animation/Vesna2D/Vesna Anims Tools/S01-Idle-Harke/0002.png.import # art/animation/Vesna2D/Vesna Anims Tools/S01-Idle-Harke/0003.png.import # art/animation/Vesna2D/Vesna Anims Tools/S01-Idle-Harke/0004.png.import # art/animation/Vesna2D/Vesna Anims Tools/S01-Idle-Harke/0005.png.import # art/animation/Vesna2D/Vesna Anims Tools/S01-Idle-Harke/0006.png.import # art/animation/Vesna2D/Vesna Anims Tools/S01-Idle-Harke/0007.png.import # art/animation/Vesna2D/Vesna Anims Tools/S01-Idle-Harke/0008.png.import # art/animation/Vesna2D/Vesna Anims Tools/S01-Idle-Harke/0009.png.import # art/animation/Vesna2D/Vesna Anims Tools/S01-Idle-Harke/0010.png.import # art/animation/Vesna2D/Vesna Anims Tools/S01-Idle-Harke/0011.png.import # art/animation/Vesna2D/Vesna Anims Tools/S01-Idle-Harke/0012.png.import # art/animation/Vesna2D/Vesna Anims Tools/S01-Idle-Harke/0013.png.import # art/animation/Vesna2D/Vesna Anims Tools/S01-Idle-Harke/0014.png.import # art/animation/Vesna2D/Vesna Anims Tools/S01-Idle-Harke/0015.png.import # art/animation/Vesna2D/Vesna Anims Tools/S01-Idle-Harke/0016.png.import # art/animation/Vesna2D/Vesna Anims Tools/S01-Idle-Harke/0017.png.import # art/animation/Vesna2D/Vesna Anims Tools/S01-Idle-Harke/0018.png.import # art/animation/Vesna2D/Vesna Anims Tools/S01-Idle-Harke/0019.png.import # art/animation/Vesna2D/Vesna Anims Tools/S01-Idle-Harke/0020.png.import # art/animation/Vesna2D/Vesna Anims Tools/S02-Walk-Gießkanne/0001.png.import # art/animation/Vesna2D/Vesna Anims Tools/S02-Walk-Gießkanne/0002.png.import # art/animation/Vesna2D/Vesna Anims Tools/S02-Walk-Gießkanne/0003.png.import # art/animation/Vesna2D/Vesna Anims Tools/S02-Walk-Gießkanne/0004.png.import # art/animation/Vesna2D/Vesna Anims Tools/S02-Walk-Gießkanne/0005.png.import # art/animation/Vesna2D/Vesna Anims Tools/S02-Walk-Gießkanne/0006.png.import # art/animation/Vesna2D/Vesna Anims Tools/S02-Walk-Gießkanne/0007.png.import # art/animation/Vesna2D/Vesna Anims Tools/S02-Walk-Gießkanne/0008.png.import # art/animation/Vesna2D/Vesna Anims Tools/S02-Walk-Gießkanne/0009.png.import # art/animation/Vesna2D/Vesna Anims Tools/S02-Walk-Gießkanne/0010.png.import # art/animation/Vesna2D/Vesna Anims Tools/S02-Walk-Gießkanne/0011.png.import # art/animation/Vesna2D/Vesna Anims Tools/S02-Walk-Gießkanne/0012.png.import # art/animation/Vesna2D/Vesna Anims Tools/S02-Walk-Gießkanne/0013.png.import # art/animation/Vesna2D/Vesna Anims Tools/S02-Walk-Gießkanne/0014.png.import # art/animation/Vesna2D/Vesna Anims Tools/S02-Walk-Gießkanne/0015.png.import # art/animation/Vesna2D/Vesna Anims Tools/S02-Walk-Gießkanne/0016.png.import # art/animation/Vesna2D/Vesna Anims Tools/S02-Walk-Gießkanne/0017.png.import # art/animation/Vesna2D/Vesna Anims Tools/S02-Walk-Gießkanne/0018.png.import # art/animation/Vesna2D/Vesna Anims Tools/S02-Walk-Gießkanne/0019.png.import # art/animation/Vesna2D/Vesna Anims Tools/S02-Walk-Gießkanne/0020.png.import # art/animation/Vesna2D/Vesna Anims Tools/S02-Walk-Harke/0001.png.import # art/animation/Vesna2D/Vesna Anims Tools/S02-Walk-Harke/0002.png.import # art/animation/Vesna2D/Vesna Anims Tools/S02-Walk-Harke/0003.png.import # art/animation/Vesna2D/Vesna Anims Tools/S02-Walk-Harke/0004.png.import # art/animation/Vesna2D/Vesna Anims Tools/S02-Walk-Harke/0005.png.import # art/animation/Vesna2D/Vesna Anims Tools/S02-Walk-Harke/0006.png.import # art/animation/Vesna2D/Vesna Anims Tools/S02-Walk-Harke/0007.png.import # art/animation/Vesna2D/Vesna Anims Tools/S02-Walk-Harke/0008.png.import # art/animation/Vesna2D/Vesna Anims Tools/S02-Walk-Harke/0009.png.import # art/animation/Vesna2D/Vesna Anims Tools/S02-Walk-Harke/0010.png.import # art/animation/Vesna2D/Vesna Anims Tools/S02-Walk-Harke/0011.png.import # art/animation/Vesna2D/Vesna Anims Tools/S02-Walk-Harke/0012.png.import # art/animation/Vesna2D/Vesna Anims Tools/S02-Walk-Harke/0013.png.import # art/animation/Vesna2D/Vesna Anims Tools/S02-Walk-Harke/0014.png.import # art/animation/Vesna2D/Vesna Anims Tools/S02-Walk-Harke/0015.png.import # art/animation/Vesna2D/Vesna Anims Tools/S02-Walk-Harke/0016.png.import # art/animation/Vesna2D/Vesna Anims Tools/S02-Walk-Harke/0017.png.import # art/animation/Vesna2D/Vesna Anims Tools/S02-Walk-Harke/0018.png.import # art/animation/Vesna2D/Vesna Anims Tools/S02-Walk-Harke/0019.png.import # art/animation/Vesna2D/Vesna Anims Tools/S02-Walk-Harke/0020.png.import # prefabs/UI/Inventory/Inventory.tscn # scenes/Babushka_scene_farm_outside_2d.tscn
This commit is contained in:
@@ -1,13 +1,27 @@
|
||||
#nullable enable
|
||||
using System;
|
||||
using Godot;
|
||||
|
||||
namespace Babushka.scripts.CSharp.Common.Inventory;
|
||||
|
||||
public partial class InventoryManager : Node
|
||||
{
|
||||
public static InventoryManager Instance { get; private set; }
|
||||
[Signal]
|
||||
public delegate void SlotIndexChangedEventHandler(int newIndex);
|
||||
|
||||
public static InventoryManager Instance { get; private set; } = null!;
|
||||
public int CurrentSelectedSlotIndex
|
||||
{
|
||||
get => _currentSelectedSlotIndex;
|
||||
set
|
||||
{
|
||||
_currentSelectedSlotIndex = value;
|
||||
EmitSignalSlotIndexChanged(_currentSelectedSlotIndex);
|
||||
}
|
||||
}
|
||||
|
||||
public InventoryInstance playerInventory;
|
||||
public InventoryInstance playerInventory = new InventoryInstance();
|
||||
|
||||
private int _currentSelectedSlotIndex = 0;
|
||||
|
||||
public override void _EnterTree()
|
||||
{
|
||||
@@ -16,8 +30,7 @@ public partial class InventoryManager : Node
|
||||
|
||||
public override void _Ready()
|
||||
{
|
||||
playerInventory = new InventoryInstance();
|
||||
playerInventory.SlotAmount = 30;
|
||||
playerInventory.SlotAmount = 37;
|
||||
}
|
||||
|
||||
public InventoryActionResult CreateItem(
|
||||
@@ -68,4 +81,14 @@ public partial class InventoryManager : Node
|
||||
{
|
||||
return playerInventory.AddItem(itemInstance);
|
||||
}
|
||||
}
|
||||
|
||||
public InventorySlot GetCurrentSelectedSlot()
|
||||
{
|
||||
if (CurrentSelectedSlotIndex < 0 || CurrentSelectedSlotIndex > 8)
|
||||
throw new ArgumentOutOfRangeException(
|
||||
nameof(CurrentSelectedSlotIndex),
|
||||
"currentInventoryBarIndex must be between 0 and 8 (inclusively)");
|
||||
|
||||
return playerInventory.Slots[CurrentSelectedSlotIndex];
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,28 +1,34 @@
|
||||
#nullable enable
|
||||
using Godot;
|
||||
|
||||
namespace Babushka.scripts.CSharp.Common.Inventory;
|
||||
|
||||
public partial class InventoryUi : Control
|
||||
{
|
||||
private GridContainer _slots;
|
||||
private Control _slots;
|
||||
private Control _slotsMover;
|
||||
private InventoryInstance _playerInventory;
|
||||
private Control _slotSelect;
|
||||
|
||||
private int? _slotOnMouse;
|
||||
|
||||
private int _selectedSlot = 0;
|
||||
|
||||
private bool _inventoryExtended = false;
|
||||
private Tween? _inventoryExtensionTween;
|
||||
|
||||
[Export]
|
||||
private float _inventoryClosedOffset = 0f;
|
||||
|
||||
[Export]
|
||||
private float _inventoryOpenedOffset = 200f;
|
||||
|
||||
public override void _Ready()
|
||||
{
|
||||
GD.Print("Ready inventory ui");
|
||||
_slots = GetNode<GridContainer>("SlotsContainer/Slots");
|
||||
_slots = GetNode<Control>("SlotsContainer/SlotsMover/Slots");
|
||||
_slotsMover = GetNode<Control>("SlotsContainer/SlotsMover");
|
||||
_playerInventory = InventoryManager.Instance.playerInventory;
|
||||
_slotSelect = GetNode<Control>("SlotsContainer/SlotSelectContainer/Selector");
|
||||
PopulateSlots();
|
||||
//PopulateSlots();
|
||||
SubscribeSlots();
|
||||
SetSlotContent();
|
||||
SetSlotSelectPosition();
|
||||
InventoryManager.Instance.playerInventory.InventoryContentsChanged += SetSlotContent;
|
||||
@@ -54,7 +60,7 @@ public partial class InventoryUi : Control
|
||||
|
||||
private void SetSlotSelectPosition()
|
||||
{
|
||||
_slotSelect.Position = new Vector2(_selectedSlot * 100, 0);
|
||||
_slotSelect.Position = new Vector2(InventoryManager.Instance.CurrentSelectedSlotIndex * 100, 0);
|
||||
}
|
||||
|
||||
private void PopulateSlots()
|
||||
@@ -68,6 +74,17 @@ public partial class InventoryUi : Control
|
||||
_slots.AddChild(slotInstance);
|
||||
}
|
||||
}
|
||||
|
||||
private void SubscribeSlots()
|
||||
{
|
||||
for (var index = 0; index < _playerInventory.Slots.Count; index++)
|
||||
{
|
||||
var slotInstance = _slots.GetChild<SlotUi>(index);
|
||||
slotInstance.index = index;
|
||||
slotInstance.Clicked += SlotClicked;
|
||||
_slots.AddChild(slotInstance);
|
||||
}
|
||||
}
|
||||
|
||||
private void UnsubscribeSlots()
|
||||
{
|
||||
@@ -108,17 +125,17 @@ public partial class InventoryUi : Control
|
||||
|
||||
if (Input.IsActionJustPressed("ui_inventory_disadvance"))
|
||||
{
|
||||
_selectedSlot++;
|
||||
if (_selectedSlot > 9)
|
||||
_selectedSlot = 0;
|
||||
InventoryManager.Instance.CurrentSelectedSlotIndex++;
|
||||
if (InventoryManager.Instance.CurrentSelectedSlotIndex > 8)
|
||||
InventoryManager.Instance.CurrentSelectedSlotIndex = 0;
|
||||
SetSlotSelectPosition();
|
||||
}
|
||||
|
||||
if (Input.IsActionJustPressed("ui_inventory_advance"))
|
||||
{
|
||||
_selectedSlot--;
|
||||
if (_selectedSlot < 0)
|
||||
_selectedSlot = 9;
|
||||
InventoryManager.Instance.CurrentSelectedSlotIndex--;
|
||||
if (InventoryManager.Instance.CurrentSelectedSlotIndex < 0)
|
||||
InventoryManager.Instance.CurrentSelectedSlotIndex = 8;
|
||||
SetSlotSelectPosition();
|
||||
}
|
||||
}
|
||||
@@ -134,7 +151,7 @@ public partial class InventoryUi : Control
|
||||
_inventoryExtensionTween = GetTree().CreateTween();
|
||||
_slotSelect.Hide();
|
||||
_inventoryExtensionTween
|
||||
.TweenProperty(_slots, "offset_bottom", -100, 0.4)
|
||||
.TweenProperty(_slotsMover, "offset_bottom", _inventoryOpenedOffset, 0.4)
|
||||
.SetTrans(Tween.TransitionType.Quad)
|
||||
.SetEase(Tween.EaseType.Out);
|
||||
}
|
||||
@@ -144,7 +161,7 @@ public partial class InventoryUi : Control
|
||||
_inventoryExtensionTween = GetTree().CreateTween();
|
||||
_slotSelect.Show();
|
||||
_inventoryExtensionTween
|
||||
.TweenProperty(_slots, "offset_bottom", 200, 0.4)
|
||||
.TweenProperty(_slotsMover, "offset_bottom", _inventoryClosedOffset, 0.4)
|
||||
.SetTrans(Tween.TransitionType.Quad)
|
||||
.SetEase(Tween.EaseType.Out);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user