From 155c122053837f48a3978398b68a107200640b1d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20Schr=C3=B6der?=
<fschroeder@techfak.uni-bielefeld.de>
Date: Mon, 10 Mar 2025 19:19:13 +0100
Subject: [PATCH] Add ConveyerManager to environment configs and new assets
This commit introduces the ConveyerManager to multiple environment configuration files, enhancing consistency across setups. Additionally, new Moonlander spaceship assets are added to support visual updates in the game.
---
.../configs/dummy_environment_config.yaml | 4 +++-
.../environment_config_deterministic_order.yaml | 4 +++-
.../configs/environment_config_moonlander.yaml | 4 +++-
.../environment_config_no_validation.yaml | 4 +++-
.../configs/environment_config_with_addons.yaml | 4 +++-
.../spaceship_master_left_turn.png | Bin 0 -> 1271 bytes
.../spaceship_master_right_turn.png | Bin 0 -> 1302 bytes
7 files changed, 15 insertions(+), 5 deletions(-)
create mode 100644 cooperative_cuisine/pygame_2d_vis/images/moonlander_assets/spaceship_master_left_turn.png
create mode 100644 cooperative_cuisine/pygame_2d_vis/images/moonlander_assets/spaceship_master_right_turn.png
diff --git a/cooperative_cuisine/configs/dummy_environment_config.yaml b/cooperative_cuisine/configs/dummy_environment_config.yaml
index e05bcc85..ac88d342 100644
--- a/cooperative_cuisine/configs/dummy_environment_config.yaml
+++ b/cooperative_cuisine/configs/dummy_environment_config.yaml
@@ -98,6 +98,8 @@ effect_manager:
kwargs:
spreading_duration: [ 5, 10 ]
fire_burns_ingredients_and_meals: true
-
+ ConveyerManager:
+ class: !!python/name:cooperative_cuisine.effects.ConveyerManager ''
+ kwargs: {}
hook_callbacks: [ ]
diff --git a/cooperative_cuisine/configs/environment_config_deterministic_order.yaml b/cooperative_cuisine/configs/environment_config_deterministic_order.yaml
index b8490cce..0e70774b 100644
--- a/cooperative_cuisine/configs/environment_config_deterministic_order.yaml
+++ b/cooperative_cuisine/configs/environment_config_deterministic_order.yaml
@@ -94,7 +94,9 @@ effect_manager:
kwargs:
spreading_duration: [ 5, 10 ]
fire_burns_ingredients_and_meals: true
-
+ ConveyerManager:
+ class: !!python/name:cooperative_cuisine.effects.ConveyerManager ''
+ kwargs: {}
hook_callbacks:
# # --------------- Scoring ---------------
diff --git a/cooperative_cuisine/configs/environment_config_moonlander.yaml b/cooperative_cuisine/configs/environment_config_moonlander.yaml
index cbaf40fd..e95aabcf 100644
--- a/cooperative_cuisine/configs/environment_config_moonlander.yaml
+++ b/cooperative_cuisine/configs/environment_config_moonlander.yaml
@@ -103,7 +103,9 @@ effect_manager:
kwargs:
spreading_duration: [ 5, 10 ]
fire_burns_ingredients_and_meals: true
-
+ ConveyerManager:
+ class: !!python/name:cooperative_cuisine.effects.ConveyerManager ''
+ kwargs: {}
hook_callbacks:
random_items:
diff --git a/cooperative_cuisine/configs/environment_config_no_validation.yaml b/cooperative_cuisine/configs/environment_config_no_validation.yaml
index 6d649437..21851bba 100644
--- a/cooperative_cuisine/configs/environment_config_no_validation.yaml
+++ b/cooperative_cuisine/configs/environment_config_no_validation.yaml
@@ -99,7 +99,9 @@ effect_manager:
kwargs:
spreading_duration: [ 5, 10 ]
fire_burns_ingredients_and_meals: true
-
+ ConveyerManager:
+ class: !!python/name:cooperative_cuisine.effects.ConveyerManager ''
+ kwargs: {}
hook_callbacks:
# # --------------- Scoring ---------------
diff --git a/cooperative_cuisine/configs/environment_config_with_addons.yaml b/cooperative_cuisine/configs/environment_config_with_addons.yaml
index ec57740a..25af3004 100644
--- a/cooperative_cuisine/configs/environment_config_with_addons.yaml
+++ b/cooperative_cuisine/configs/environment_config_with_addons.yaml
@@ -102,7 +102,9 @@ effect_manager:
kwargs:
spreading_duration: [ 5, 10 ]
fire_burns_ingredients_and_meals: true
-
+ ConveyerManager:
+ class: !!python/name:cooperative_cuisine.effects.ConveyerManager ''
+ kwargs: {}
hook_callbacks:
reach_target:
diff --git a/cooperative_cuisine/pygame_2d_vis/images/moonlander_assets/spaceship_master_left_turn.png b/cooperative_cuisine/pygame_2d_vis/images/moonlander_assets/spaceship_master_left_turn.png
new file mode 100644
index 0000000000000000000000000000000000000000..d789ae2c3a2841315e98351e3ac3ac4dc93738c4
GIT binary patch
literal 1271
zcmeAS@N?(olHy`uVBq!ia0y~yU@!t<4mJh`208nVjSLJd`#fD7Lo%G-&h+&Nbrd=N
zeCq}dtzQNc#TI>GeYr@*YtfP|{BOLq3+B#t$`(u!VG$H@k<|U<nLDpri9_qR!Qx8?
zluSPCH00JYY8E(bP%?Szj=leXoU46)Zuau)<<B2gUtIHUZuR>!f1cH!n`vCkd?-M3
zT}94T^S3-Z^45J_tLpXn?tXjE!^fnUIDS1c2>b05sebymp`e9MO8rjW#bNh9)lC#q
z*gfmiQ-#^u?`}^%n5ef`tJ~2fGRu4$3qxZxUsL(^6#ni*OJzO%b1umXarjy^FnlU~
ztrmGT+*bWSqEuC$bq}+`^t5>sO5Zw5KFT@x;7h{=1w)RNXAV>a{@LRo;8E(hH2DFG
z(o~0^7j()}%TJwt<huXp7R^KHvk!a73z%Li$v76sF2E_s=n$wFV6MBYwXf7*NncIe
zhf85g%ib(%agc3v<`h{m(MUmpgLi@(fAQf1+11DXwmBC}Ui7^-P(_3*(tg_A&a)XR
zk8YS><Tf>0sW78(hRFBnDOXllhA1n?eyB1?EVyKMpuP1q7c0A?Gspbk#+R}?6o0t{
z{OWo2C(nmVcx!Ro+`Fj;5>u{QDO^{WanhZ8-ibD*qse{mg)}GYaOf^6HTGg*fBEK>
z$V2nQe1$vgAqze%S9*Q)KuvoDLwkR~#g&WNV)z{HS2AtX`n=}Y+vSgayh~rWH-CS-
zh1sC>{I^?vzRWiZpUjRhuy($)Ylh_K?JGXFZ@1mxysp$YqIC7Ckkea58>QIi&y(KX
zaeMw_9nb8jj4g)BDdwwwag}EsIB`t5QpBgnUBh8Pfxtf*yY_t_`uLc>2DJFBs{6X5
zKj7T4mFhl$0y{q#IV7;9*kzR*vfiSm^QXcg<nJ#%=Uk-;7uFn&+8S!P;=I0jvFqRS
z>QSmMW^+1v%v`lf>u1~|)(H*_jgQz`)HKdbi(qy24DwyxqAjph_}!INTF0NsiT?fj
zxbjMhLaz3;TfXJ#G1oTvn0}vC^v&Bq>%`AJo0VkvcC(#4cSfv!js2sWCstZaSn1@k
zf2PMRm-7t8%hXSQydmOYB;eWnz*&?{!P(jQ(w;jrruj`wQM74%ki2iF5#u87#ye3y
zLCaiwi$nL!nkH^)qrGU>jeQSo*UgcA&B4DvPO+!qMS|LA!F>v|8VuMDC1x16THQU>
zSG7bl;-{~p1na|d{x7)>K3Oj#y6D$zhbTXVPm6vnQI~((cp$<#LqwBDcZ$)~{0O1f
z*`L!lTCa|ImNLa+nF)tmUj8Aa<=uM<1eR#3s;VASyA<J^o11%W>crJ$VrR;yurOb4
zk`mckR8-V+P=fW~s&n7<O3p9~EHN?AJ~bh5`Xz<$&+JQ9G%XHjI`AM^j-|P!(oyt4
zfJ9qopvdRbYkJz_WjV^fZDBmPAhY_6Z%@JkzDp95_c`WD7nixu>Akn2T`+D_bnNea
zx*dgcO=C8^xDq?BP%`G^)qORgE$_qk{5vtz%=L<W6occ(qDOXuJ^5W1E?)e2PwZxW
zd1m0RMhk^+`2vsLWlO8A6=CcMVG_`Izw62S%oUU7DRc!c*XPh=TF_CsRF>nI?)mKh
ztO7EkYct<={Pf(V^(a79YU>C7BkN6$ZZBm~DErbC^P97AUk&TS{fa(ve_w?C_^&Wo
lweX9~svk3x1MTY>onIIyxV-LK#=yY9;OXk;vd$@?2>|LCND2S|
literal 0
HcmV?d00001
diff --git a/cooperative_cuisine/pygame_2d_vis/images/moonlander_assets/spaceship_master_right_turn.png b/cooperative_cuisine/pygame_2d_vis/images/moonlander_assets/spaceship_master_right_turn.png
new file mode 100644
index 0000000000000000000000000000000000000000..2179b3f9b9061e319ac9b271f579b0c3b12d7304
GIT binary patch
literal 1302
zcmeAS@N?(olHy`uVBq!ia0y~yU@!t<4mJh`208nVjSLJdcRgJkLo%G-&h*U)br(5)
zKKe+>VvV*o1qtP?7qZMMn*=X5cm_{WTf40(;EmEvjmok>AC~}*rUfRgdbe73b-s4E
zy`=6U|79WXjX{_6k`~@dI^oph>l@%`!oB``{Uqa=<}-i4JHFdl=ta)G**lBVpPBzJ
zK38*xXX(s!cR#I2j8@B<T>5)`g>rMg>$><AcSEECWq&AymTP71NjBa7y4F!{Z`dli
z^jGs%{$prlKh2c#W&YfI{gYp>$o_tHC*!&12l@$Bb$QPYzTzy+70_+|z2n`}zs{X%
z<`=z<3>r%Mrv}H~)DbVW{XJtr$2_Z5{Ht^nR{fIu++hB%VD41`hLu}V6arG7><_i+
zJ3V=;%ld5}>KQLN2HZ0@J8)j|Nv~nn${$ldXBoM~2A`TxbFpi|UsnT-FO3Y7m!H^^
z^!Uo@!$yh`SC_IKRB(|zlXv}wT-!@c+kFX98kZSLRJ$4v>|Uvnv`UFNMZ*4TNPN0M
zpu>qHb5!Ps^af10^H9b*?fuVt4ha@}8fL6I!SGPrz%WpUuS4$Vwg0sZw{G8Fo4iqs
z%Rz5?a9ZKh#PkJ!XBoUw{m-xPKsa>D;<cjkE8GLG7#uctaLezDQa2M&*{$ro_4Z#4
zllcsne%8z={&lFWCT4;GNB)v2p?P!jf-ds>yyC!eicO_^u`jP?bN>v1YV9<Q-=}(a
z&TU|8*b`}P)=^$yeEvkMxxZ%Uf{vM1|Mz&!R4!&@R=D~8{zI*TJkR&?^B28T-~8q6
zbLo(oER7eB<%=o&dFzw?bDzUyVb@#xtes~z?(Wt(nH9Ci{nO=(_C+dcY0QqY2NW1N
z%+|VVP2uMF$E>D5>1TG^mrxESFORI*x#5$S`{x||z@6H+E_ab{`!P<nhE{!@!j#Hi
z>w}K6UHX6N^p}Lw)9*}?JQ<*-rdrG85pd*Dr;driOkG3y+iC&z@ud=sEbkeY1$ay=
zUAlk&eeNKqU;SGZZplPRt(s}OY{skn|6;2+w8F!}E-ml3J3ZSwmY0($F-%}p$J$1P
z8OKc1SE>X%O%9$cBC0a`?4^^t?{+(U@epHG66A>6bZ`l4(XL<nx>5oag_>_9JZd_y
z=G3WEpF}*l0!29DuFbXQov@^R)gs3d;co7xbEWc{ZoP{feT2KE>-NW$PrSPzq9ep1
z#~@Jbh>2nl^TosstQ+5M4RHS!U39|BnX@xzqu7xP1vkq3zGpBU+Wll7Z^`TRS1V_`
zl}1kd@ani3U%G<Co29><UF>t?UTl9XH{Wo=kC^!%79F%a@!`V;_0_wWE>?fdm;HM9
z(k2$hBS(&~@JG*y<x4oU$eH2GVpI8`+S*#Ju!&yE5-a$c_Poh?cwy3)WCkbGu<xRb
zOblmi627bsowC>Z^S4hdhM^a)3-QG0y)DS|msYx3x<sI3#<Vr^r{!GQ51z`s*VN%z
z=)kcfgFALLlh%@FZ?=6qd%DBq@Y<X6g9Sc?SM7ZN)SpjQea_eCYZA}QsNtA&Q~TK-
z!L*`t4o{>+6T|)2CCq8Q60`fD%>10(XYt{6k3?J)UhIu^iU0dZ<d`joo&WxQwdZy{
zON?3ZNbbmopcyw#u{1_{MqTWZP$=q`5%YU&SDqim^l0_R>ci(;ws!<BnA4b0t#sc{
zC2MC8^MZ2@7k2PHK6TPnce%nZ-;_zx-!#;|+I!52oYbpa_qb+D=WX^^`xzG8^G;CO
TBYvELfq}u()z4*}Q$iB}-IZcU
literal 0
HcmV?d00001
--
GitLab