diff --git a/assets/rl_trashes/cardboard373.jpg b/assets/rl_trashes/cardboard373.jpg new file mode 100644 index 0000000..9727475 Binary files /dev/null and b/assets/rl_trashes/cardboard373.jpg differ diff --git a/assets/rl_trashes/cardboard374.jpg b/assets/rl_trashes/cardboard374.jpg new file mode 100644 index 0000000..24a3e24 Binary files /dev/null and b/assets/rl_trashes/cardboard374.jpg differ diff --git a/assets/rl_trashes/cardboard375.jpg b/assets/rl_trashes/cardboard375.jpg new file mode 100644 index 0000000..1b9e265 Binary files /dev/null and b/assets/rl_trashes/cardboard375.jpg differ diff --git a/assets/rl_trashes/cardboard376.jpg b/assets/rl_trashes/cardboard376.jpg new file mode 100644 index 0000000..d162be3 Binary files /dev/null and b/assets/rl_trashes/cardboard376.jpg differ diff --git a/assets/rl_trashes/cardboard377.jpg b/assets/rl_trashes/cardboard377.jpg new file mode 100644 index 0000000..cf6b629 Binary files /dev/null and b/assets/rl_trashes/cardboard377.jpg differ diff --git a/assets/rl_trashes/cardboard378.jpg b/assets/rl_trashes/cardboard378.jpg new file mode 100644 index 0000000..b6d0f5a Binary files /dev/null and b/assets/rl_trashes/cardboard378.jpg differ diff --git a/assets/rl_trashes/cardboard379.jpg b/assets/rl_trashes/cardboard379.jpg new file mode 100644 index 0000000..117abe0 Binary files /dev/null and b/assets/rl_trashes/cardboard379.jpg differ diff --git a/assets/rl_trashes/cardboard380.jpg b/assets/rl_trashes/cardboard380.jpg new file mode 100644 index 0000000..7502c34 Binary files /dev/null and b/assets/rl_trashes/cardboard380.jpg differ diff --git a/assets/rl_trashes/cardboard381.jpg b/assets/rl_trashes/cardboard381.jpg new file mode 100644 index 0000000..bb25d6c Binary files /dev/null and b/assets/rl_trashes/cardboard381.jpg differ diff --git a/assets/rl_trashes/cardboard382.jpg b/assets/rl_trashes/cardboard382.jpg new file mode 100644 index 0000000..6eadee2 Binary files /dev/null and b/assets/rl_trashes/cardboard382.jpg differ diff --git a/assets/rl_trashes/cardboard383.jpg b/assets/rl_trashes/cardboard383.jpg new file mode 100644 index 0000000..4045ea0 Binary files /dev/null and b/assets/rl_trashes/cardboard383.jpg differ diff --git a/assets/rl_trashes/cardboard384.jpg b/assets/rl_trashes/cardboard384.jpg new file mode 100644 index 0000000..ccc085d Binary files /dev/null and b/assets/rl_trashes/cardboard384.jpg differ diff --git a/assets/rl_trashes/cardboard385.jpg b/assets/rl_trashes/cardboard385.jpg new file mode 100644 index 0000000..8f5590e Binary files /dev/null and b/assets/rl_trashes/cardboard385.jpg differ diff --git a/assets/rl_trashes/cardboard386.jpg b/assets/rl_trashes/cardboard386.jpg new file mode 100644 index 0000000..2d8c99d Binary files /dev/null and b/assets/rl_trashes/cardboard386.jpg differ diff --git a/assets/rl_trashes/cardboard387.jpg b/assets/rl_trashes/cardboard387.jpg new file mode 100644 index 0000000..7c8e72c Binary files /dev/null and b/assets/rl_trashes/cardboard387.jpg differ diff --git a/assets/rl_trashes/cardboard388.jpg b/assets/rl_trashes/cardboard388.jpg new file mode 100644 index 0000000..5811d9f Binary files /dev/null and b/assets/rl_trashes/cardboard388.jpg differ diff --git a/assets/rl_trashes/cardboard389.jpg b/assets/rl_trashes/cardboard389.jpg new file mode 100644 index 0000000..00c0c91 Binary files /dev/null and b/assets/rl_trashes/cardboard389.jpg differ diff --git a/assets/rl_trashes/cardboard390.jpg b/assets/rl_trashes/cardboard390.jpg new file mode 100644 index 0000000..68ca778 Binary files /dev/null and b/assets/rl_trashes/cardboard390.jpg differ diff --git a/assets/rl_trashes/cardboard391.jpg b/assets/rl_trashes/cardboard391.jpg new file mode 100644 index 0000000..6dfe465 Binary files /dev/null and b/assets/rl_trashes/cardboard391.jpg differ diff --git a/assets/rl_trashes/cardboard392.jpg b/assets/rl_trashes/cardboard392.jpg new file mode 100644 index 0000000..62ec3f4 Binary files /dev/null and b/assets/rl_trashes/cardboard392.jpg differ diff --git a/assets/rl_trashes/cardboard393.jpg b/assets/rl_trashes/cardboard393.jpg new file mode 100644 index 0000000..bfdb13b Binary files /dev/null and b/assets/rl_trashes/cardboard393.jpg differ diff --git a/assets/rl_trashes/cardboard394.jpg b/assets/rl_trashes/cardboard394.jpg new file mode 100644 index 0000000..ce133ec Binary files /dev/null and b/assets/rl_trashes/cardboard394.jpg differ diff --git a/assets/rl_trashes/cardboard395.jpg b/assets/rl_trashes/cardboard395.jpg new file mode 100644 index 0000000..ad760f7 Binary files /dev/null and b/assets/rl_trashes/cardboard395.jpg differ diff --git a/assets/rl_trashes/cardboard396.jpg b/assets/rl_trashes/cardboard396.jpg new file mode 100644 index 0000000..a946c8b Binary files /dev/null and b/assets/rl_trashes/cardboard396.jpg differ diff --git a/assets/rl_trashes/cardboard397.jpg b/assets/rl_trashes/cardboard397.jpg new file mode 100644 index 0000000..ea75a35 Binary files /dev/null and b/assets/rl_trashes/cardboard397.jpg differ diff --git a/assets/rl_trashes/cardboard398.jpg b/assets/rl_trashes/cardboard398.jpg new file mode 100644 index 0000000..b44e7bc Binary files /dev/null and b/assets/rl_trashes/cardboard398.jpg differ diff --git a/assets/rl_trashes/cardboard399.jpg b/assets/rl_trashes/cardboard399.jpg new file mode 100644 index 0000000..9e4e3a0 Binary files /dev/null and b/assets/rl_trashes/cardboard399.jpg differ diff --git a/assets/rl_trashes/cardboard400.jpg b/assets/rl_trashes/cardboard400.jpg new file mode 100644 index 0000000..39c9096 Binary files /dev/null and b/assets/rl_trashes/cardboard400.jpg differ diff --git a/assets/rl_trashes/cardboard401.jpg b/assets/rl_trashes/cardboard401.jpg new file mode 100644 index 0000000..2b58704 Binary files /dev/null and b/assets/rl_trashes/cardboard401.jpg differ diff --git a/assets/rl_trashes/cardboard402.jpg b/assets/rl_trashes/cardboard402.jpg new file mode 100644 index 0000000..5314854 Binary files /dev/null and b/assets/rl_trashes/cardboard402.jpg differ diff --git a/assets/rl_trashes/cardboard403.jpg b/assets/rl_trashes/cardboard403.jpg new file mode 100644 index 0000000..51809a6 Binary files /dev/null and b/assets/rl_trashes/cardboard403.jpg differ diff --git a/assets/rl_trashes/glass469.jpg b/assets/rl_trashes/glass469.jpg new file mode 100644 index 0000000..a590e37 Binary files /dev/null and b/assets/rl_trashes/glass469.jpg differ diff --git a/assets/rl_trashes/glass470.jpg b/assets/rl_trashes/glass470.jpg new file mode 100644 index 0000000..25bb581 Binary files /dev/null and b/assets/rl_trashes/glass470.jpg differ diff --git a/assets/rl_trashes/glass471.jpg b/assets/rl_trashes/glass471.jpg new file mode 100644 index 0000000..775971f Binary files /dev/null and b/assets/rl_trashes/glass471.jpg differ diff --git a/assets/rl_trashes/glass472.jpg b/assets/rl_trashes/glass472.jpg new file mode 100644 index 0000000..b8ad1ed Binary files /dev/null and b/assets/rl_trashes/glass472.jpg differ diff --git a/assets/rl_trashes/glass473.jpg b/assets/rl_trashes/glass473.jpg new file mode 100644 index 0000000..580bc41 Binary files /dev/null and b/assets/rl_trashes/glass473.jpg differ diff --git a/assets/rl_trashes/glass474.jpg b/assets/rl_trashes/glass474.jpg new file mode 100644 index 0000000..02a13f8 Binary files /dev/null and b/assets/rl_trashes/glass474.jpg differ diff --git a/assets/rl_trashes/glass475.jpg b/assets/rl_trashes/glass475.jpg new file mode 100644 index 0000000..e1b04ca Binary files /dev/null and b/assets/rl_trashes/glass475.jpg differ diff --git a/assets/rl_trashes/glass476.jpg b/assets/rl_trashes/glass476.jpg new file mode 100644 index 0000000..6205233 Binary files /dev/null and b/assets/rl_trashes/glass476.jpg differ diff --git a/assets/rl_trashes/glass477.jpg b/assets/rl_trashes/glass477.jpg new file mode 100644 index 0000000..68e0a5d Binary files /dev/null and b/assets/rl_trashes/glass477.jpg differ diff --git a/assets/rl_trashes/glass478.jpg b/assets/rl_trashes/glass478.jpg new file mode 100644 index 0000000..8063308 Binary files /dev/null and b/assets/rl_trashes/glass478.jpg differ diff --git a/assets/rl_trashes/glass479.jpg b/assets/rl_trashes/glass479.jpg new file mode 100644 index 0000000..af37519 Binary files /dev/null and b/assets/rl_trashes/glass479.jpg differ diff --git a/assets/rl_trashes/glass480.jpg b/assets/rl_trashes/glass480.jpg new file mode 100644 index 0000000..da93e27 Binary files /dev/null and b/assets/rl_trashes/glass480.jpg differ diff --git a/assets/rl_trashes/glass481.jpg b/assets/rl_trashes/glass481.jpg new file mode 100644 index 0000000..d7f596d Binary files /dev/null and b/assets/rl_trashes/glass481.jpg differ diff --git a/assets/rl_trashes/glass482.jpg b/assets/rl_trashes/glass482.jpg new file mode 100644 index 0000000..92ad79e Binary files /dev/null and b/assets/rl_trashes/glass482.jpg differ diff --git a/assets/rl_trashes/glass483.jpg b/assets/rl_trashes/glass483.jpg new file mode 100644 index 0000000..76986a9 Binary files /dev/null and b/assets/rl_trashes/glass483.jpg differ diff --git a/assets/rl_trashes/glass484.jpg b/assets/rl_trashes/glass484.jpg new file mode 100644 index 0000000..49897b6 Binary files /dev/null and b/assets/rl_trashes/glass484.jpg differ diff --git a/assets/rl_trashes/glass485.jpg b/assets/rl_trashes/glass485.jpg new file mode 100644 index 0000000..07a45b1 Binary files /dev/null and b/assets/rl_trashes/glass485.jpg differ diff --git a/assets/rl_trashes/glass486.jpg b/assets/rl_trashes/glass486.jpg new file mode 100644 index 0000000..8c29f18 Binary files /dev/null and b/assets/rl_trashes/glass486.jpg differ diff --git a/assets/rl_trashes/glass487.jpg b/assets/rl_trashes/glass487.jpg new file mode 100644 index 0000000..6b878c0 Binary files /dev/null and b/assets/rl_trashes/glass487.jpg differ diff --git a/assets/rl_trashes/glass488.jpg b/assets/rl_trashes/glass488.jpg new file mode 100644 index 0000000..4eb4ce1 Binary files /dev/null and b/assets/rl_trashes/glass488.jpg differ diff --git a/assets/rl_trashes/glass489.jpg b/assets/rl_trashes/glass489.jpg new file mode 100644 index 0000000..4978342 Binary files /dev/null and b/assets/rl_trashes/glass489.jpg differ diff --git a/assets/rl_trashes/glass490.jpg b/assets/rl_trashes/glass490.jpg new file mode 100644 index 0000000..df764a1 Binary files /dev/null and b/assets/rl_trashes/glass490.jpg differ diff --git a/assets/rl_trashes/glass491.jpg b/assets/rl_trashes/glass491.jpg new file mode 100644 index 0000000..0f2bd13 Binary files /dev/null and b/assets/rl_trashes/glass491.jpg differ diff --git a/assets/rl_trashes/glass492.jpg b/assets/rl_trashes/glass492.jpg new file mode 100644 index 0000000..c74ac3f Binary files /dev/null and b/assets/rl_trashes/glass492.jpg differ diff --git a/assets/rl_trashes/glass493.jpg b/assets/rl_trashes/glass493.jpg new file mode 100644 index 0000000..ed76913 Binary files /dev/null and b/assets/rl_trashes/glass493.jpg differ diff --git a/assets/rl_trashes/glass494.jpg b/assets/rl_trashes/glass494.jpg new file mode 100644 index 0000000..605565d Binary files /dev/null and b/assets/rl_trashes/glass494.jpg differ diff --git a/assets/rl_trashes/glass495.jpg b/assets/rl_trashes/glass495.jpg new file mode 100644 index 0000000..ab8edc5 Binary files /dev/null and b/assets/rl_trashes/glass495.jpg differ diff --git a/assets/rl_trashes/glass496.jpg b/assets/rl_trashes/glass496.jpg new file mode 100644 index 0000000..2eaeb65 Binary files /dev/null and b/assets/rl_trashes/glass496.jpg differ diff --git a/assets/rl_trashes/glass497.jpg b/assets/rl_trashes/glass497.jpg new file mode 100644 index 0000000..7da1a59 Binary files /dev/null and b/assets/rl_trashes/glass497.jpg differ diff --git a/assets/rl_trashes/glass498.jpg b/assets/rl_trashes/glass498.jpg new file mode 100644 index 0000000..cd5b985 Binary files /dev/null and b/assets/rl_trashes/glass498.jpg differ diff --git a/assets/rl_trashes/glass499.jpg b/assets/rl_trashes/glass499.jpg new file mode 100644 index 0000000..f31662d Binary files /dev/null and b/assets/rl_trashes/glass499.jpg differ diff --git a/assets/rl_trashes/glass500.jpg b/assets/rl_trashes/glass500.jpg new file mode 100644 index 0000000..6db57ed Binary files /dev/null and b/assets/rl_trashes/glass500.jpg differ diff --git a/assets/rl_trashes/glass501.jpg b/assets/rl_trashes/glass501.jpg new file mode 100644 index 0000000..5ae0e77 Binary files /dev/null and b/assets/rl_trashes/glass501.jpg differ diff --git a/assets/rl_trashes/metal385.jpg b/assets/rl_trashes/metal385.jpg new file mode 100644 index 0000000..766fcae Binary files /dev/null and b/assets/rl_trashes/metal385.jpg differ diff --git a/assets/rl_trashes/metal386.jpg b/assets/rl_trashes/metal386.jpg new file mode 100644 index 0000000..724a6d9 Binary files /dev/null and b/assets/rl_trashes/metal386.jpg differ diff --git a/assets/rl_trashes/metal387.jpg b/assets/rl_trashes/metal387.jpg new file mode 100644 index 0000000..db02407 Binary files /dev/null and b/assets/rl_trashes/metal387.jpg differ diff --git a/assets/rl_trashes/metal388.jpg b/assets/rl_trashes/metal388.jpg new file mode 100644 index 0000000..1c4f367 Binary files /dev/null and b/assets/rl_trashes/metal388.jpg differ diff --git a/assets/rl_trashes/metal389.jpg b/assets/rl_trashes/metal389.jpg new file mode 100644 index 0000000..42eaddc Binary files /dev/null and b/assets/rl_trashes/metal389.jpg differ diff --git a/assets/rl_trashes/metal390.jpg b/assets/rl_trashes/metal390.jpg new file mode 100644 index 0000000..ca48b9d Binary files /dev/null and b/assets/rl_trashes/metal390.jpg differ diff --git a/assets/rl_trashes/metal391.jpg b/assets/rl_trashes/metal391.jpg new file mode 100644 index 0000000..b95f08a Binary files /dev/null and b/assets/rl_trashes/metal391.jpg differ diff --git a/assets/rl_trashes/metal392.jpg b/assets/rl_trashes/metal392.jpg new file mode 100644 index 0000000..7d4ba6a Binary files /dev/null and b/assets/rl_trashes/metal392.jpg differ diff --git a/assets/rl_trashes/metal393.jpg b/assets/rl_trashes/metal393.jpg new file mode 100644 index 0000000..b29222b Binary files /dev/null and b/assets/rl_trashes/metal393.jpg differ diff --git a/assets/rl_trashes/metal394.jpg b/assets/rl_trashes/metal394.jpg new file mode 100644 index 0000000..068a9ef Binary files /dev/null and b/assets/rl_trashes/metal394.jpg differ diff --git a/assets/rl_trashes/metal395.jpg b/assets/rl_trashes/metal395.jpg new file mode 100644 index 0000000..c997b90 Binary files /dev/null and b/assets/rl_trashes/metal395.jpg differ diff --git a/assets/rl_trashes/metal396.jpg b/assets/rl_trashes/metal396.jpg new file mode 100644 index 0000000..936c33b Binary files /dev/null and b/assets/rl_trashes/metal396.jpg differ diff --git a/assets/rl_trashes/metal397.jpg b/assets/rl_trashes/metal397.jpg new file mode 100644 index 0000000..2a3235e Binary files /dev/null and b/assets/rl_trashes/metal397.jpg differ diff --git a/assets/rl_trashes/metal398.jpg b/assets/rl_trashes/metal398.jpg new file mode 100644 index 0000000..2936303 Binary files /dev/null and b/assets/rl_trashes/metal398.jpg differ diff --git a/assets/rl_trashes/metal399.jpg b/assets/rl_trashes/metal399.jpg new file mode 100644 index 0000000..09a51ff Binary files /dev/null and b/assets/rl_trashes/metal399.jpg differ diff --git a/assets/rl_trashes/metal400.jpg b/assets/rl_trashes/metal400.jpg new file mode 100644 index 0000000..88ac50a Binary files /dev/null and b/assets/rl_trashes/metal400.jpg differ diff --git a/assets/rl_trashes/metal401.jpg b/assets/rl_trashes/metal401.jpg new file mode 100644 index 0000000..d225713 Binary files /dev/null and b/assets/rl_trashes/metal401.jpg differ diff --git a/assets/rl_trashes/metal402.jpg b/assets/rl_trashes/metal402.jpg new file mode 100644 index 0000000..4836781 Binary files /dev/null and b/assets/rl_trashes/metal402.jpg differ diff --git a/assets/rl_trashes/metal403.jpg b/assets/rl_trashes/metal403.jpg new file mode 100644 index 0000000..25d2a27 Binary files /dev/null and b/assets/rl_trashes/metal403.jpg differ diff --git a/assets/rl_trashes/metal404.jpg b/assets/rl_trashes/metal404.jpg new file mode 100644 index 0000000..f1d3458 Binary files /dev/null and b/assets/rl_trashes/metal404.jpg differ diff --git a/assets/rl_trashes/metal405.jpg b/assets/rl_trashes/metal405.jpg new file mode 100644 index 0000000..8572ba5 Binary files /dev/null and b/assets/rl_trashes/metal405.jpg differ diff --git a/assets/rl_trashes/metal406.jpg b/assets/rl_trashes/metal406.jpg new file mode 100644 index 0000000..91f8af1 Binary files /dev/null and b/assets/rl_trashes/metal406.jpg differ diff --git a/assets/rl_trashes/metal407.jpg b/assets/rl_trashes/metal407.jpg new file mode 100644 index 0000000..dcd6275 Binary files /dev/null and b/assets/rl_trashes/metal407.jpg differ diff --git a/assets/rl_trashes/metal408.jpg b/assets/rl_trashes/metal408.jpg new file mode 100644 index 0000000..f31f188 Binary files /dev/null and b/assets/rl_trashes/metal408.jpg differ diff --git a/assets/rl_trashes/metal409.jpg b/assets/rl_trashes/metal409.jpg new file mode 100644 index 0000000..d4c5596 Binary files /dev/null and b/assets/rl_trashes/metal409.jpg differ diff --git a/assets/rl_trashes/metal410.jpg b/assets/rl_trashes/metal410.jpg new file mode 100644 index 0000000..c4b812d Binary files /dev/null and b/assets/rl_trashes/metal410.jpg differ diff --git a/assets/rl_trashes/paper553.jpg b/assets/rl_trashes/paper553.jpg new file mode 100644 index 0000000..e02913f Binary files /dev/null and b/assets/rl_trashes/paper553.jpg differ diff --git a/assets/rl_trashes/paper554.jpg b/assets/rl_trashes/paper554.jpg new file mode 100644 index 0000000..19bac2c Binary files /dev/null and b/assets/rl_trashes/paper554.jpg differ diff --git a/assets/rl_trashes/paper555.jpg b/assets/rl_trashes/paper555.jpg new file mode 100644 index 0000000..7f3e6cb Binary files /dev/null and b/assets/rl_trashes/paper555.jpg differ diff --git a/assets/rl_trashes/paper556.jpg b/assets/rl_trashes/paper556.jpg new file mode 100644 index 0000000..53813d8 Binary files /dev/null and b/assets/rl_trashes/paper556.jpg differ diff --git a/assets/rl_trashes/paper557.jpg b/assets/rl_trashes/paper557.jpg new file mode 100644 index 0000000..aaa19e8 Binary files /dev/null and b/assets/rl_trashes/paper557.jpg differ diff --git a/assets/rl_trashes/paper558.jpg b/assets/rl_trashes/paper558.jpg new file mode 100644 index 0000000..fe0f539 Binary files /dev/null and b/assets/rl_trashes/paper558.jpg differ diff --git a/assets/rl_trashes/paper559.jpg b/assets/rl_trashes/paper559.jpg new file mode 100644 index 0000000..48fad43 Binary files /dev/null and b/assets/rl_trashes/paper559.jpg differ diff --git a/assets/rl_trashes/paper560.jpg b/assets/rl_trashes/paper560.jpg new file mode 100644 index 0000000..a340bba Binary files /dev/null and b/assets/rl_trashes/paper560.jpg differ diff --git a/assets/rl_trashes/paper561.jpg b/assets/rl_trashes/paper561.jpg new file mode 100644 index 0000000..732cdd3 Binary files /dev/null and b/assets/rl_trashes/paper561.jpg differ diff --git a/assets/rl_trashes/paper562.jpg b/assets/rl_trashes/paper562.jpg new file mode 100644 index 0000000..e3eb9b1 Binary files /dev/null and b/assets/rl_trashes/paper562.jpg differ diff --git a/assets/rl_trashes/paper563.jpg b/assets/rl_trashes/paper563.jpg new file mode 100644 index 0000000..52ad254 Binary files /dev/null and b/assets/rl_trashes/paper563.jpg differ diff --git a/assets/rl_trashes/paper564.jpg b/assets/rl_trashes/paper564.jpg new file mode 100644 index 0000000..273fd3b Binary files /dev/null and b/assets/rl_trashes/paper564.jpg differ diff --git a/assets/rl_trashes/paper565.jpg b/assets/rl_trashes/paper565.jpg new file mode 100644 index 0000000..40d2919 Binary files /dev/null and b/assets/rl_trashes/paper565.jpg differ diff --git a/assets/rl_trashes/paper566.jpg b/assets/rl_trashes/paper566.jpg new file mode 100644 index 0000000..f08773d Binary files /dev/null and b/assets/rl_trashes/paper566.jpg differ diff --git a/assets/rl_trashes/paper567.jpg b/assets/rl_trashes/paper567.jpg new file mode 100644 index 0000000..8490f16 Binary files /dev/null and b/assets/rl_trashes/paper567.jpg differ diff --git a/assets/rl_trashes/paper568.jpg b/assets/rl_trashes/paper568.jpg new file mode 100644 index 0000000..2b98174 Binary files /dev/null and b/assets/rl_trashes/paper568.jpg differ diff --git a/assets/rl_trashes/paper569.jpg b/assets/rl_trashes/paper569.jpg new file mode 100644 index 0000000..6d2dd60 Binary files /dev/null and b/assets/rl_trashes/paper569.jpg differ diff --git a/assets/rl_trashes/paper570.jpg b/assets/rl_trashes/paper570.jpg new file mode 100644 index 0000000..54c9c5a Binary files /dev/null and b/assets/rl_trashes/paper570.jpg differ diff --git a/assets/rl_trashes/paper571.jpg b/assets/rl_trashes/paper571.jpg new file mode 100644 index 0000000..fe707f7 Binary files /dev/null and b/assets/rl_trashes/paper571.jpg differ diff --git a/assets/rl_trashes/paper572.jpg b/assets/rl_trashes/paper572.jpg new file mode 100644 index 0000000..2b322a0 Binary files /dev/null and b/assets/rl_trashes/paper572.jpg differ diff --git a/assets/rl_trashes/paper573.jpg b/assets/rl_trashes/paper573.jpg new file mode 100644 index 0000000..aace4de Binary files /dev/null and b/assets/rl_trashes/paper573.jpg differ diff --git a/assets/rl_trashes/paper574.jpg b/assets/rl_trashes/paper574.jpg new file mode 100644 index 0000000..e998613 Binary files /dev/null and b/assets/rl_trashes/paper574.jpg differ diff --git a/assets/rl_trashes/paper575.jpg b/assets/rl_trashes/paper575.jpg new file mode 100644 index 0000000..b7f1e51 Binary files /dev/null and b/assets/rl_trashes/paper575.jpg differ diff --git a/assets/rl_trashes/paper576.jpg b/assets/rl_trashes/paper576.jpg new file mode 100644 index 0000000..ed3d616 Binary files /dev/null and b/assets/rl_trashes/paper576.jpg differ diff --git a/assets/rl_trashes/paper577.jpg b/assets/rl_trashes/paper577.jpg new file mode 100644 index 0000000..b3d26a2 Binary files /dev/null and b/assets/rl_trashes/paper577.jpg differ diff --git a/assets/rl_trashes/paper578.jpg b/assets/rl_trashes/paper578.jpg new file mode 100644 index 0000000..cf3a0fc Binary files /dev/null and b/assets/rl_trashes/paper578.jpg differ diff --git a/assets/rl_trashes/paper579.jpg b/assets/rl_trashes/paper579.jpg new file mode 100644 index 0000000..83273b0 Binary files /dev/null and b/assets/rl_trashes/paper579.jpg differ diff --git a/assets/rl_trashes/paper580.jpg b/assets/rl_trashes/paper580.jpg new file mode 100644 index 0000000..056757b Binary files /dev/null and b/assets/rl_trashes/paper580.jpg differ diff --git a/assets/rl_trashes/paper581.jpg b/assets/rl_trashes/paper581.jpg new file mode 100644 index 0000000..752d18b Binary files /dev/null and b/assets/rl_trashes/paper581.jpg differ diff --git a/assets/rl_trashes/paper582.jpg b/assets/rl_trashes/paper582.jpg new file mode 100644 index 0000000..f72f3e5 Binary files /dev/null and b/assets/rl_trashes/paper582.jpg differ diff --git a/assets/rl_trashes/paper583.jpg b/assets/rl_trashes/paper583.jpg new file mode 100644 index 0000000..458ffc3 Binary files /dev/null and b/assets/rl_trashes/paper583.jpg differ diff --git a/assets/rl_trashes/paper584.jpg b/assets/rl_trashes/paper584.jpg new file mode 100644 index 0000000..fb99a07 Binary files /dev/null and b/assets/rl_trashes/paper584.jpg differ diff --git a/assets/rl_trashes/paper585.jpg b/assets/rl_trashes/paper585.jpg new file mode 100644 index 0000000..8f5e5f9 Binary files /dev/null and b/assets/rl_trashes/paper585.jpg differ diff --git a/assets/rl_trashes/paper586.jpg b/assets/rl_trashes/paper586.jpg new file mode 100644 index 0000000..9e9d5e1 Binary files /dev/null and b/assets/rl_trashes/paper586.jpg differ diff --git a/assets/rl_trashes/paper587.jpg b/assets/rl_trashes/paper587.jpg new file mode 100644 index 0000000..8380778 Binary files /dev/null and b/assets/rl_trashes/paper587.jpg differ diff --git a/assets/rl_trashes/paper588.jpg b/assets/rl_trashes/paper588.jpg new file mode 100644 index 0000000..2a7065f Binary files /dev/null and b/assets/rl_trashes/paper588.jpg differ diff --git a/assets/rl_trashes/plastic445.jpg b/assets/rl_trashes/plastic445.jpg new file mode 100644 index 0000000..99cf6ff Binary files /dev/null and b/assets/rl_trashes/plastic445.jpg differ diff --git a/assets/rl_trashes/plastic446.jpg b/assets/rl_trashes/plastic446.jpg new file mode 100644 index 0000000..f65ef3b Binary files /dev/null and b/assets/rl_trashes/plastic446.jpg differ diff --git a/assets/rl_trashes/plastic447.jpg b/assets/rl_trashes/plastic447.jpg new file mode 100644 index 0000000..5ca3189 Binary files /dev/null and b/assets/rl_trashes/plastic447.jpg differ diff --git a/assets/rl_trashes/plastic448.jpg b/assets/rl_trashes/plastic448.jpg new file mode 100644 index 0000000..c6d4539 Binary files /dev/null and b/assets/rl_trashes/plastic448.jpg differ diff --git a/assets/rl_trashes/plastic449.jpg b/assets/rl_trashes/plastic449.jpg new file mode 100644 index 0000000..9a8f532 Binary files /dev/null and b/assets/rl_trashes/plastic449.jpg differ diff --git a/assets/rl_trashes/plastic450.jpg b/assets/rl_trashes/plastic450.jpg new file mode 100644 index 0000000..de11bea Binary files /dev/null and b/assets/rl_trashes/plastic450.jpg differ diff --git a/assets/rl_trashes/plastic451.jpg b/assets/rl_trashes/plastic451.jpg new file mode 100644 index 0000000..22c8d29 Binary files /dev/null and b/assets/rl_trashes/plastic451.jpg differ diff --git a/assets/rl_trashes/plastic452.jpg b/assets/rl_trashes/plastic452.jpg new file mode 100644 index 0000000..f5c39b0 Binary files /dev/null and b/assets/rl_trashes/plastic452.jpg differ diff --git a/assets/rl_trashes/plastic453.jpg b/assets/rl_trashes/plastic453.jpg new file mode 100644 index 0000000..7efaaa3 Binary files /dev/null and b/assets/rl_trashes/plastic453.jpg differ diff --git a/assets/rl_trashes/plastic454.jpg b/assets/rl_trashes/plastic454.jpg new file mode 100644 index 0000000..9472577 Binary files /dev/null and b/assets/rl_trashes/plastic454.jpg differ diff --git a/assets/rl_trashes/plastic455.jpg b/assets/rl_trashes/plastic455.jpg new file mode 100644 index 0000000..aabbb3c Binary files /dev/null and b/assets/rl_trashes/plastic455.jpg differ diff --git a/assets/rl_trashes/plastic456.jpg b/assets/rl_trashes/plastic456.jpg new file mode 100644 index 0000000..672da4f Binary files /dev/null and b/assets/rl_trashes/plastic456.jpg differ diff --git a/assets/rl_trashes/plastic457.jpg b/assets/rl_trashes/plastic457.jpg new file mode 100644 index 0000000..3f6d119 Binary files /dev/null and b/assets/rl_trashes/plastic457.jpg differ diff --git a/assets/rl_trashes/plastic458.jpg b/assets/rl_trashes/plastic458.jpg new file mode 100644 index 0000000..66d2346 Binary files /dev/null and b/assets/rl_trashes/plastic458.jpg differ diff --git a/assets/rl_trashes/plastic459.jpg b/assets/rl_trashes/plastic459.jpg new file mode 100644 index 0000000..043302a Binary files /dev/null and b/assets/rl_trashes/plastic459.jpg differ diff --git a/assets/rl_trashes/plastic460.jpg b/assets/rl_trashes/plastic460.jpg new file mode 100644 index 0000000..d15f3ef Binary files /dev/null and b/assets/rl_trashes/plastic460.jpg differ diff --git a/assets/rl_trashes/plastic461.jpg b/assets/rl_trashes/plastic461.jpg new file mode 100644 index 0000000..69a070f Binary files /dev/null and b/assets/rl_trashes/plastic461.jpg differ diff --git a/assets/rl_trashes/plastic462.jpg b/assets/rl_trashes/plastic462.jpg new file mode 100644 index 0000000..79898ba Binary files /dev/null and b/assets/rl_trashes/plastic462.jpg differ diff --git a/assets/rl_trashes/plastic463.jpg b/assets/rl_trashes/plastic463.jpg new file mode 100644 index 0000000..3e2ab64 Binary files /dev/null and b/assets/rl_trashes/plastic463.jpg differ diff --git a/assets/rl_trashes/plastic464.jpg b/assets/rl_trashes/plastic464.jpg new file mode 100644 index 0000000..0c3533b Binary files /dev/null and b/assets/rl_trashes/plastic464.jpg differ diff --git a/assets/rl_trashes/plastic465.jpg b/assets/rl_trashes/plastic465.jpg new file mode 100644 index 0000000..5e98517 Binary files /dev/null and b/assets/rl_trashes/plastic465.jpg differ diff --git a/assets/rl_trashes/plastic466.jpg b/assets/rl_trashes/plastic466.jpg new file mode 100644 index 0000000..8bc6023 Binary files /dev/null and b/assets/rl_trashes/plastic466.jpg differ diff --git a/assets/rl_trashes/plastic467.jpg b/assets/rl_trashes/plastic467.jpg new file mode 100644 index 0000000..ad03ace Binary files /dev/null and b/assets/rl_trashes/plastic467.jpg differ diff --git a/assets/rl_trashes/plastic468.jpg b/assets/rl_trashes/plastic468.jpg new file mode 100644 index 0000000..9890acb Binary files /dev/null and b/assets/rl_trashes/plastic468.jpg differ diff --git a/assets/rl_trashes/plastic469.jpg b/assets/rl_trashes/plastic469.jpg new file mode 100644 index 0000000..b446ca4 Binary files /dev/null and b/assets/rl_trashes/plastic469.jpg differ diff --git a/assets/rl_trashes/plastic470.jpg b/assets/rl_trashes/plastic470.jpg new file mode 100644 index 0000000..2098086 Binary files /dev/null and b/assets/rl_trashes/plastic470.jpg differ diff --git a/assets/rl_trashes/plastic471.jpg b/assets/rl_trashes/plastic471.jpg new file mode 100644 index 0000000..6993f0c Binary files /dev/null and b/assets/rl_trashes/plastic471.jpg differ diff --git a/assets/rl_trashes/plastic472.jpg b/assets/rl_trashes/plastic472.jpg new file mode 100644 index 0000000..3a460d8 Binary files /dev/null and b/assets/rl_trashes/plastic472.jpg differ diff --git a/assets/rl_trashes/plastic473.jpg b/assets/rl_trashes/plastic473.jpg new file mode 100644 index 0000000..db5a4ef Binary files /dev/null and b/assets/rl_trashes/plastic473.jpg differ diff --git a/assets/rl_trashes/plastic474.jpg b/assets/rl_trashes/plastic474.jpg new file mode 100644 index 0000000..a0e4127 Binary files /dev/null and b/assets/rl_trashes/plastic474.jpg differ diff --git a/assets/rl_trashes/plastic475.jpg b/assets/rl_trashes/plastic475.jpg new file mode 100644 index 0000000..ee1403a Binary files /dev/null and b/assets/rl_trashes/plastic475.jpg differ diff --git a/assets/rl_trashes/plastic476.jpg b/assets/rl_trashes/plastic476.jpg new file mode 100644 index 0000000..b3b7919 Binary files /dev/null and b/assets/rl_trashes/plastic476.jpg differ diff --git a/assets/rl_trashes/plastic477.jpg b/assets/rl_trashes/plastic477.jpg new file mode 100644 index 0000000..a26db7a Binary files /dev/null and b/assets/rl_trashes/plastic477.jpg differ diff --git a/assets/rl_trashes/plastic478.jpg b/assets/rl_trashes/plastic478.jpg new file mode 100644 index 0000000..f427723 Binary files /dev/null and b/assets/rl_trashes/plastic478.jpg differ diff --git a/assets/rl_trashes/plastic479.jpg b/assets/rl_trashes/plastic479.jpg new file mode 100644 index 0000000..4360902 Binary files /dev/null and b/assets/rl_trashes/plastic479.jpg differ diff --git a/assets/rl_trashes/plastic480.jpg b/assets/rl_trashes/plastic480.jpg new file mode 100644 index 0000000..78bbb3d Binary files /dev/null and b/assets/rl_trashes/plastic480.jpg differ diff --git a/assets/rl_trashes/plastic481.jpg b/assets/rl_trashes/plastic481.jpg new file mode 100644 index 0000000..3d5febc Binary files /dev/null and b/assets/rl_trashes/plastic481.jpg differ diff --git a/assets/rl_trashes/plastic482.jpg b/assets/rl_trashes/plastic482.jpg new file mode 100644 index 0000000..d912903 Binary files /dev/null and b/assets/rl_trashes/plastic482.jpg differ diff --git a/assets/rl_trashes/trash100.jpg b/assets/rl_trashes/trash100.jpg new file mode 100644 index 0000000..ffade55 Binary files /dev/null and b/assets/rl_trashes/trash100.jpg differ diff --git a/assets/rl_trashes/trash101.jpg b/assets/rl_trashes/trash101.jpg new file mode 100644 index 0000000..212e4b5 Binary files /dev/null and b/assets/rl_trashes/trash101.jpg differ diff --git a/assets/rl_trashes/trash102.jpg b/assets/rl_trashes/trash102.jpg new file mode 100644 index 0000000..b9f66e8 Binary files /dev/null and b/assets/rl_trashes/trash102.jpg differ diff --git a/assets/rl_trashes/trash103.jpg b/assets/rl_trashes/trash103.jpg new file mode 100644 index 0000000..f0d52e6 Binary files /dev/null and b/assets/rl_trashes/trash103.jpg differ diff --git a/assets/rl_trashes/trash104.jpg b/assets/rl_trashes/trash104.jpg new file mode 100644 index 0000000..5634ed5 Binary files /dev/null and b/assets/rl_trashes/trash104.jpg differ diff --git a/assets/rl_trashes/trash105.jpg b/assets/rl_trashes/trash105.jpg new file mode 100644 index 0000000..03b8072 Binary files /dev/null and b/assets/rl_trashes/trash105.jpg differ diff --git a/assets/rl_trashes/trash106.jpg b/assets/rl_trashes/trash106.jpg new file mode 100644 index 0000000..e5c5d53 Binary files /dev/null and b/assets/rl_trashes/trash106.jpg differ diff --git a/assets/rl_trashes/trash107.jpg b/assets/rl_trashes/trash107.jpg new file mode 100644 index 0000000..b460914 Binary files /dev/null and b/assets/rl_trashes/trash107.jpg differ diff --git a/assets/rl_trashes/trash108.jpg b/assets/rl_trashes/trash108.jpg new file mode 100644 index 0000000..4dc5b74 Binary files /dev/null and b/assets/rl_trashes/trash108.jpg differ diff --git a/assets/rl_trashes/trash109.jpg b/assets/rl_trashes/trash109.jpg new file mode 100644 index 0000000..221beb9 Binary files /dev/null and b/assets/rl_trashes/trash109.jpg differ diff --git a/assets/rl_trashes/trash110.jpg b/assets/rl_trashes/trash110.jpg new file mode 100644 index 0000000..7423532 Binary files /dev/null and b/assets/rl_trashes/trash110.jpg differ diff --git a/assets/rl_trashes/trash111.jpg b/assets/rl_trashes/trash111.jpg new file mode 100644 index 0000000..a3670c0 Binary files /dev/null and b/assets/rl_trashes/trash111.jpg differ diff --git a/assets/rl_trashes/trash112.jpg b/assets/rl_trashes/trash112.jpg new file mode 100644 index 0000000..b24b912 Binary files /dev/null and b/assets/rl_trashes/trash112.jpg differ diff --git a/assets/rl_trashes/trash113.jpg b/assets/rl_trashes/trash113.jpg new file mode 100644 index 0000000..97e57b8 Binary files /dev/null and b/assets/rl_trashes/trash113.jpg differ diff --git a/assets/rl_trashes/trash114.jpg b/assets/rl_trashes/trash114.jpg new file mode 100644 index 0000000..fec5474 Binary files /dev/null and b/assets/rl_trashes/trash114.jpg differ diff --git a/assets/rl_trashes/trash115.jpg b/assets/rl_trashes/trash115.jpg new file mode 100644 index 0000000..7d4517f Binary files /dev/null and b/assets/rl_trashes/trash115.jpg differ diff --git a/assets/rl_trashes/trash116.jpg b/assets/rl_trashes/trash116.jpg new file mode 100644 index 0000000..b398bee Binary files /dev/null and b/assets/rl_trashes/trash116.jpg differ diff --git a/assets/rl_trashes/trash117.jpg b/assets/rl_trashes/trash117.jpg new file mode 100644 index 0000000..08a7680 Binary files /dev/null and b/assets/rl_trashes/trash117.jpg differ diff --git a/assets/rl_trashes/trash118.jpg b/assets/rl_trashes/trash118.jpg new file mode 100644 index 0000000..393e579 Binary files /dev/null and b/assets/rl_trashes/trash118.jpg differ diff --git a/assets/rl_trashes/trash119.jpg b/assets/rl_trashes/trash119.jpg new file mode 100644 index 0000000..2691bda Binary files /dev/null and b/assets/rl_trashes/trash119.jpg differ diff --git a/assets/rl_trashes/trash120.jpg b/assets/rl_trashes/trash120.jpg new file mode 100644 index 0000000..3c11042 Binary files /dev/null and b/assets/rl_trashes/trash120.jpg differ diff --git a/assets/rl_trashes/trash121.jpg b/assets/rl_trashes/trash121.jpg new file mode 100644 index 0000000..67715f0 Binary files /dev/null and b/assets/rl_trashes/trash121.jpg differ diff --git a/assets/rl_trashes/trash122.jpg b/assets/rl_trashes/trash122.jpg new file mode 100644 index 0000000..1196ecd Binary files /dev/null and b/assets/rl_trashes/trash122.jpg differ diff --git a/assets/rl_trashes/trash123.jpg b/assets/rl_trashes/trash123.jpg new file mode 100644 index 0000000..dab5e0d Binary files /dev/null and b/assets/rl_trashes/trash123.jpg differ diff --git a/assets/rl_trashes/trash124.jpg b/assets/rl_trashes/trash124.jpg new file mode 100644 index 0000000..c69313c Binary files /dev/null and b/assets/rl_trashes/trash124.jpg differ diff --git a/assets/rl_trashes/trash125.jpg b/assets/rl_trashes/trash125.jpg new file mode 100644 index 0000000..cdd5bdf Binary files /dev/null and b/assets/rl_trashes/trash125.jpg differ diff --git a/assets/rl_trashes/trash126.jpg b/assets/rl_trashes/trash126.jpg new file mode 100644 index 0000000..7b855c3 Binary files /dev/null and b/assets/rl_trashes/trash126.jpg differ diff --git a/assets/rl_trashes/trash127.jpg b/assets/rl_trashes/trash127.jpg new file mode 100644 index 0000000..0a1a84f Binary files /dev/null and b/assets/rl_trashes/trash127.jpg differ diff --git a/assets/rl_trashes/trash128.jpg b/assets/rl_trashes/trash128.jpg new file mode 100644 index 0000000..1abfba2 Binary files /dev/null and b/assets/rl_trashes/trash128.jpg differ diff --git a/assets/rl_trashes/trash129.jpg b/assets/rl_trashes/trash129.jpg new file mode 100644 index 0000000..4538f56 Binary files /dev/null and b/assets/rl_trashes/trash129.jpg differ diff --git a/assets/rl_trashes/trash130.jpg b/assets/rl_trashes/trash130.jpg new file mode 100644 index 0000000..0017ccf Binary files /dev/null and b/assets/rl_trashes/trash130.jpg differ diff --git a/assets/rl_trashes/trash131.jpg b/assets/rl_trashes/trash131.jpg new file mode 100644 index 0000000..0bfb39a Binary files /dev/null and b/assets/rl_trashes/trash131.jpg differ diff --git a/assets/rl_trashes/trash132.jpg b/assets/rl_trashes/trash132.jpg new file mode 100644 index 0000000..0ab5c7b Binary files /dev/null and b/assets/rl_trashes/trash132.jpg differ diff --git a/assets/rl_trashes/trash133.jpg b/assets/rl_trashes/trash133.jpg new file mode 100644 index 0000000..2848d4a Binary files /dev/null and b/assets/rl_trashes/trash133.jpg differ diff --git a/assets/rl_trashes/trash134.jpg b/assets/rl_trashes/trash134.jpg new file mode 100644 index 0000000..a49dec7 Binary files /dev/null and b/assets/rl_trashes/trash134.jpg differ diff --git a/assets/rl_trashes/trash135.jpg b/assets/rl_trashes/trash135.jpg new file mode 100644 index 0000000..ff8e69e Binary files /dev/null and b/assets/rl_trashes/trash135.jpg differ diff --git a/assets/rl_trashes/trash136.jpg b/assets/rl_trashes/trash136.jpg new file mode 100644 index 0000000..9097627 Binary files /dev/null and b/assets/rl_trashes/trash136.jpg differ diff --git a/assets/rl_trashes/trash137.jpg b/assets/rl_trashes/trash137.jpg new file mode 100644 index 0000000..adafd74 Binary files /dev/null and b/assets/rl_trashes/trash137.jpg differ diff --git a/assets/rl_trashes/trash97.jpg b/assets/rl_trashes/trash97.jpg new file mode 100644 index 0000000..0acadd6 Binary files /dev/null and b/assets/rl_trashes/trash97.jpg differ diff --git a/assets/rl_trashes/trash98.jpg b/assets/rl_trashes/trash98.jpg new file mode 100644 index 0000000..938d2ba Binary files /dev/null and b/assets/rl_trashes/trash98.jpg differ diff --git a/assets/rl_trashes/trash99.jpg b/assets/rl_trashes/trash99.jpg new file mode 100644 index 0000000..c758c7a Binary files /dev/null and b/assets/rl_trashes/trash99.jpg differ diff --git a/src/config.py b/src/config.py index aaf5fb0..cef1b95 100644 --- a/src/config.py +++ b/src/config.py @@ -1,11 +1,11 @@ FPS = 30 -DEFAULT_ASSET_SIZE = 64 -DEFAULT_MAP_SIZE = 12 +DEFAULT_ASSET_SIZE = 96 +DEFAULT_MAP_SIZE = 8 WINDOW_HEIGHT = DEFAULT_ASSET_SIZE * DEFAULT_MAP_SIZE WINDOW_WIDTH = DEFAULT_ASSET_SIZE * DEFAULT_MAP_SIZE -PADDING = 64 +PADDING = 96 TRASHES_COUNT = 4 diff --git a/src/entitie/Obs.py b/src/entitie/Obs.py index 692e953..6e59f7d 100644 --- a/src/entitie/Obs.py +++ b/src/entitie/Obs.py @@ -7,5 +7,5 @@ class Obs: self.abstractY = y self.object = pygame.Rect(self.abstractX * DEFAULT_ASSET_SIZE, self.abstractY * DEFAULT_ASSET_SIZE, DEFAULT_ASSET_SIZE, DEFAULT_ASSET_SIZE) - self.asset = pygame.Surface((64, 64)) + self.asset = pygame.Surface((DEFAULT_ASSET_SIZE, DEFAULT_ASSET_SIZE)) self.asset.fill((171, 48, 74)) \ No newline at end of file diff --git a/src/entitie/Space.py b/src/entitie/Space.py index 25a3b07..4ed34ad 100644 --- a/src/entitie/Space.py +++ b/src/entitie/Space.py @@ -8,5 +8,5 @@ class Space: self.abstractY = y self.object = pygame.Rect(self.abstractX * DEFAULT_ASSET_SIZE, self.abstractY * DEFAULT_ASSET_SIZE, DEFAULT_ASSET_SIZE, DEFAULT_ASSET_SIZE) - self.asset = pygame.Surface((64, 64)) + self.asset = pygame.Surface((DEFAULT_ASSET_SIZE, DEFAULT_ASSET_SIZE)) self.asset.fill((21, 30, 40)) diff --git a/src/entitie/Trash.py b/src/entitie/Trash.py index 3d46030..cce184c 100644 --- a/src/entitie/Trash.py +++ b/src/entitie/Trash.py @@ -1,6 +1,7 @@ import os import random import pygame +import re from src.config import * @@ -10,17 +11,19 @@ class Trash: self.abstractX = x self.abstractY = y self.generate_random_trash(x, y) + self.get_random_asset() + + + def get_random_asset(self): + dirPath = os.path.join(os.path.dirname(__file__), '..', '..', 'assets', 'rl_trashes') + random_trash = random.choice(os.listdir(dirPath)) + return random_trash def generate_random_trash(self, x, y): - random_index = random.randint(1, 2) + random_trash = self.get_random_asset() + self.trash_name = re.search(r"[a-z]*", random_trash[:len(random_trash)-3], re.IGNORECASE).group() + self.asset_path = os.path.join(os.path.dirname(__file__), '..', '..', 'assets', 'rl_trashes', random_trash) - if random_index == 1: - self.type = TRASH_BOTTLE - asset_path = os.path.join(os.path.dirname(__file__), '..', '..', 'assets', 'trashes', 'plastic-bottle.png') - else: - self.type = TRASH_CAN - asset_path = os.path.join(os.path.dirname(__file__), '..', '..', 'assets', 'trashes', 'can.png') - - self.asset = pygame.transform.scale(pygame.image.load(asset_path), (DEFAULT_ASSET_SIZE, DEFAULT_ASSET_SIZE)) + self.asset = pygame.transform.scale(pygame.image.load(self.asset_path), (DEFAULT_ASSET_SIZE, DEFAULT_ASSET_SIZE)) self.object = pygame.Rect(self.abstractX * DEFAULT_ASSET_SIZE, self.abstractY * DEFAULT_ASSET_SIZE, DEFAULT_ASSET_SIZE, DEFAULT_ASSET_SIZE) diff --git a/src/entitie/Truck.py b/src/entitie/Truck.py index 3137b67..db4922d 100644 --- a/src/entitie/Truck.py +++ b/src/entitie/Truck.py @@ -5,10 +5,12 @@ import pygame from src.config import * from src.entitie.Obs import Obs from src.entitie.Space import Space +from src.entitie.Trash import Trash class Truck: - def __init__(self, x=0, y=0): + def __init__(self, x=0, y=0, nn = None): + self.nn = nn self.abstractX = x self.abstractY = y self.direction = 90 @@ -18,6 +20,8 @@ class Truck: self.object = pygame.Rect(self.abstractX * DEFAULT_ASSET_SIZE, self.abstractY * DEFAULT_ASSET_SIZE, DEFAULT_ASSET_SIZE, DEFAULT_ASSET_SIZE) self.velocity = DEFAULT_ASSET_SIZE + self.rightPick= 0 + self.wrongPick= 0 def rotate_up(self): self.asset = pygame.transform.rotate(self.asset, 90) @@ -28,19 +32,33 @@ class Truck: self.direction = (self.direction - 90) % 360 def move(self, map): - print(self.direction) if self.direction == 180: - self.move_up(map) + return self.move_up(map) if self.direction == 0: - self.move_down(map) + return self.move_down(map) if self.direction == 90: - self.move_right(map) + return self.move_right(map) if self.direction == 270: - self.move_left(map) + return self.move_left(map) def replace(self, map, oldX, oldY): + predicted = None + if isinstance(map[self.abstractX][self.abstractY], Trash) and self.nn: + trash = map[self.abstractX][self.abstractY] + predicted = self.nn.getPredict(map[self.abstractX][self.abstractY].asset_path) + print(predicted) + print(trash.trash_name) + if (predicted == trash.trash_name): + self.rightPick+=1 + print('RIGHT PICK!') + else: + self.wrongPick+=1 + print('WRONG PICK!') + rate = self.rightPick/ (self.rightPick + self.wrongPick) * 100 + print("{}%".format(rate)) map[oldX][oldY] = Space(oldX, oldY) map[self.abstractX][self.abstractY] = self + return predicted def move_up(self, map): if self.abstractY == 0: @@ -51,7 +69,7 @@ class Truck: return self.abstractY -= 1 self.object.y -= self.velocity - self.replace(map, oldX, oldY) + return self.replace(map, oldX, oldY) def move_down(self, map): if self.abstractY == DEFAULT_MAP_SIZE - 1: @@ -62,7 +80,7 @@ class Truck: return self.abstractY += 1 self.object.y += self.velocity - self.replace(map, oldX, oldY) + return self.replace(map, oldX, oldY) def move_right(self, map): if self.abstractX == DEFAULT_MAP_SIZE - 1: @@ -73,7 +91,7 @@ class Truck: return self.abstractX += 1 self.object.x += self.velocity - self.replace(map, oldX, oldY) + return self.replace(map, oldX, oldY) def move_left(self, map): if self.abstractX == 0: @@ -84,4 +102,4 @@ class Truck: return self.abstractX -= 1 self.object.x -= self.velocity - self.replace(map, oldX, oldY) + return self.replace(map, oldX, oldY) diff --git a/src/learn/export.pkl b/src/learn/export.pkl new file mode 100644 index 0000000..bfd44d0 Binary files /dev/null and b/src/learn/export.pkl differ diff --git a/src/learn/nn.py b/src/learn/nn.py new file mode 100644 index 0000000..3d1d02b --- /dev/null +++ b/src/learn/nn.py @@ -0,0 +1,24 @@ +from fastai.vision import * + + +class NN: + def __init__(self): + self.trash_types = { + 4: 'plastic', + 1: 'glass', + 5: 'municipal', + 0: 'municipal', + 2: 'municipal', + 3: 'paper', + } + path = os.path.join(os.path.dirname(__file__)) + self.lerner = load_learner(path) + + def getPredict(self, path): + img = open_image(path) + interpret = self.lerner.predict(img)[2] + print(self.trash_types[self.lerner.predict(img)[1].item()]) + print(interpret.tolist()) + return self.trash_types[self.lerner.predict(img)[1].item()] + + diff --git a/src/main.py b/src/main.py index e8a0a4e..411e611 100644 --- a/src/main.py +++ b/src/main.py @@ -7,14 +7,20 @@ from src.entitie.Obs import Obs from src.entitie.Space import Space from src.entitie.Trash import Trash from src.entitie.Truck import Truck +from src.learn.nn import NN class EnvMap: + def __init__(self, isAi=True): + self.nn = None + if not isAi: + self.nn = NN() + def generate_map_field(self, x, y): random_index = random.randint(0, 100) - if random_index < 5: + if random_index < 20: return Trash(x, y) - elif random_index < 80: + elif random_index < 90: return Space(x, y) else: return Obs(x, y) @@ -30,7 +36,7 @@ class EnvMap: self.map = map def set_truck(self): - self.truck = Truck() + self.truck = Truck(0, 0, self.nn) self.map[0][0] = self.truck def get_map_copy(self): @@ -43,7 +49,7 @@ class EnvMap: o = self.map[x][y] no = None if o.__class__.__name__ == 'Truck': - no = Truck(x, y) + no = Truck(x, y, self.nn) no.direction = o.direction newEnvMap.truck = no @@ -88,7 +94,6 @@ class PathFinder(): if self.goal_test(elem.state): actions_pack = [] while (elem.parent): - print(elem.action) actions_pack.append(elem.action) elem = elem.parent @@ -158,7 +163,9 @@ class PathFinder(): class Environment: def __init__(self): - self.envMap = EnvMap() + pygame.font.init() + self.font = pygame.font.SysFont('Verdana', 32) + self.envMap = EnvMap(False) self.envMap.generate_map() self.envMap.set_truck() self.run = True @@ -192,9 +199,18 @@ class Environment: obj = self.envMap.map[x][y] self.WINDOW.blit(obj.asset, (obj.object.x, obj.object.y)) + text = 'No trashes yet' + if len(self.trashes_collected) > 0: + text = self.trashes_collected[len(self.trashes_collected) - 1] + textsurface = self.font.render("Last: " + text, False, (255, 255, 255)) + self.WINDOW.blit(textsurface, ( + DEFAULT_ASSET_SIZE * (DEFAULT_MAP_SIZE - 3), DEFAULT_ASSET_SIZE * (DEFAULT_MAP_SIZE - 3))) + def handle_keyboard(self, key): if key == pygame.K_SPACE: - self.envMap.truck.move(self.envMap.map) + trash = self.envMap.truck.move(self.envMap.map) + if trash: + self.trashes_collected.append(trash) if key == pygame.K_w: self.envMap.truck.rotate_up() if key == pygame.K_s: @@ -210,7 +226,7 @@ class Environment: action = actions.pop() next = pygame.time.get_ticks() + 300 self.update() - ev=None + ev = None if action == R_UP: ev = pygame.event.Event(pygame.KEYDOWN, {"key": pygame.K_w}) if action == R_DOWN: