From 6d0740ce992123a949827f145810689a0451aea8 Mon Sep 17 00:00:00 2001 From: Rain Caldwell <67359748+Just-a-Unity-Dev@users.noreply.github.com> Date: Wed, 24 Jul 2024 22:45:52 +0800 Subject: [PATCH 1/4] Add lunchboxes --- .../Loadouts/Miscellaneous/trinkets.yml | 23 ++++++- .../Prototypes/Loadouts/loadout_groups.yml | 2 + .../_CD/Entities/Objects/Misc/lunchboxes.yml | 56 ++++++++++++++++++ .../lunchbox_blue.rsi/icon-open.png | Bin 0 -> 272 bytes .../Lunchboxes/lunchbox_blue.rsi/icon.png | Bin 0 -> 238 bytes .../lunchbox_blue.rsi/inhand-left.png | Bin 0 -> 336 bytes .../lunchbox_blue.rsi/inhand-right.png | Bin 0 -> 342 bytes .../Lunchboxes/lunchbox_blue.rsi/meta.json | 25 ++++++++ .../lunchbox_yellow.rsi/icon-open.png | Bin 0 -> 270 bytes .../Lunchboxes/lunchbox_yellow.rsi/icon.png | Bin 0 -> 238 bytes .../lunchbox_yellow.rsi/inhand-left.png | Bin 0 -> 332 bytes .../lunchbox_yellow.rsi/inhand-right.png | Bin 0 -> 334 bytes .../Lunchboxes/lunchbox_yellow.rsi/meta.json | 25 ++++++++ 13 files changed, 130 insertions(+), 1 deletion(-) create mode 100644 Resources/Prototypes/_CD/Entities/Objects/Misc/lunchboxes.yml create mode 100644 Resources/Textures/_CD/Objects/Misc/Lunchboxes/lunchbox_blue.rsi/icon-open.png create mode 100644 Resources/Textures/_CD/Objects/Misc/Lunchboxes/lunchbox_blue.rsi/icon.png create mode 100644 Resources/Textures/_CD/Objects/Misc/Lunchboxes/lunchbox_blue.rsi/inhand-left.png create mode 100644 Resources/Textures/_CD/Objects/Misc/Lunchboxes/lunchbox_blue.rsi/inhand-right.png create mode 100644 Resources/Textures/_CD/Objects/Misc/Lunchboxes/lunchbox_blue.rsi/meta.json create mode 100644 Resources/Textures/_CD/Objects/Misc/Lunchboxes/lunchbox_yellow.rsi/icon-open.png create mode 100644 Resources/Textures/_CD/Objects/Misc/Lunchboxes/lunchbox_yellow.rsi/icon.png create mode 100644 Resources/Textures/_CD/Objects/Misc/Lunchboxes/lunchbox_yellow.rsi/inhand-left.png create mode 100644 Resources/Textures/_CD/Objects/Misc/Lunchboxes/lunchbox_yellow.rsi/inhand-right.png create mode 100644 Resources/Textures/_CD/Objects/Misc/Lunchboxes/lunchbox_yellow.rsi/meta.json diff --git a/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml b/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml index fe826a8334..edeef1b5e8 100644 --- a/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml +++ b/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml @@ -18,7 +18,7 @@ storage: back: - PlushieLizard - + - type: loadout id: PlushieSpaceLizard equipment: PlushieSpaceLizard @@ -29,6 +29,27 @@ back: - PlushieSpaceLizard +# CD: Lunchbox +- type: loadout # CD + id: LunchboxBlue + equipment: LunchboxBlue + +- type: startingGear # CD + id: LunchboxBlue + storage: + back: + - LunchboxBlue + +- type: loadout # CD + id: LunchboxYellow + equipment: LunchboxYellow + +- type: startingGear # CD + id: LunchboxYellow + storage: + back: + - LunchboxYellow + # Smokeables - type: loadout id: Lighter diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml index db1544e841..344e016383 100644 --- a/Resources/Prototypes/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/Loadouts/loadout_groups.yml @@ -7,6 +7,8 @@ loadouts: - PlushieLizard - PlushieSpaceLizard + - LunchboxBlue + - LunchboxYellow - Lighter - CigPackGreen - CigPackRed diff --git a/Resources/Prototypes/_CD/Entities/Objects/Misc/lunchboxes.yml b/Resources/Prototypes/_CD/Entities/Objects/Misc/lunchboxes.yml new file mode 100644 index 0000000000..b27309dcf9 --- /dev/null +++ b/Resources/Prototypes/_CD/Entities/Objects/Misc/lunchboxes.yml @@ -0,0 +1,56 @@ +- type: entity + id: LunchboxBase + parent: BaseStorageItem + abstract: true + components: + - type: Sprite + layers: + - map: [ base ] + state: icon + - type: EmitSoundOnLand + sound: + path: /Audio/Items/toolbox_drop.ogg + - type: Storage + capacity: 25 # ffs I forgot CD uses list inv... I hope this is enough for a sandwich and a drink + - type: Item + size: 30 + - type: MeleeWeapon + damage: + types: + Blunt: 3 + soundHit: + path: "/Audio/Weapons/smash.ogg" + - type: Tag + tags: + - Toolbox + - type: GenericVisualizer + visuals: + enum.StorageVisuals.Open: + base: + True: { state: icon-open } + False: { state: icon } + - type: Appearance + +- type: entity + name: blue lunchbox + parent: LunchboxBase + id: LunchboxBlue + description: A blue lunch box, it smells less of food and more like metal. + components: + - type: Sprite + sprite: _CD/Objects/Misc/Lunchboxes/lunchbox_blue.rsi + state: icon + - type: Item + sprite: _CD/Objects/Misc/Lunchboxes/lunchbox_blue.rsi + +- type: entity + name: yellow lunchbox + parent: LunchboxBase + id: LunchboxYellow + description: A yellow lunch box, you can tell your food will be shockingly good. # i'm so sorry for this pun + components: + - type: Sprite + sprite: _CD/Objects/Misc/Lunchboxes/lunchbox_yellow.rsi + state: icon + - type: Item + sprite: _CD/Objects/Misc/Lunchboxes/lunchbox_yellow.rsi diff --git a/Resources/Textures/_CD/Objects/Misc/Lunchboxes/lunchbox_blue.rsi/icon-open.png b/Resources/Textures/_CD/Objects/Misc/Lunchboxes/lunchbox_blue.rsi/icon-open.png new file mode 100644 index 0000000000000000000000000000000000000000..bf116d884ae1270a4187f6c0c9eb4ef640fc90c3 GIT binary patch literal 272 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCil21AIbUm1T;rT)ATEKU0p^QBgE%`pktvp@~MlyMXeCY-)Od6lY10U+{k@ zUt$pkXpUI927oT?yOh;us z4!mza*`Ur*dZFDa;7%jUN9oMa1v{84*Zg%X*w1)~Nh;$^{nK8cr3{{~elF{r5}E*c Cx?g+% literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CD/Objects/Misc/Lunchboxes/lunchbox_blue.rsi/icon.png b/Resources/Textures/_CD/Objects/Misc/Lunchboxes/lunchbox_blue.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..9ffa0609b4dff4fc7592c0324718166354e7565f GIT binary patch literal 238 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij?1AIbUm1T;JdUu)n&%AQwiX5+F@`3k2nH8sZ{RUF(B|(0{|G|Jk%A45@ zD8yOd5n0T@z;_sg8IR|$NC67^d%8G=Sops^cae`lfTK0B_1^!9vRSLU3vxf-P5GJL z74yfTGC=9JBgY9_nGL6#m%iE{dqliL`kmA>yBXgYgXh2a!fvx+*;@sfV*7yU4k--v Xb|OcQ@)_v^jb`w4^>bP0l+XkKxe!uw literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CD/Objects/Misc/Lunchboxes/lunchbox_blue.rsi/inhand-left.png b/Resources/Textures/_CD/Objects/Misc/Lunchboxes/lunchbox_blue.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..97c04d65a9f6fa8b849650b4b065c6529d1d9559 GIT binary patch literal 336 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`031o(uw%JDiX%M>RccyH=I)2MgXq)C&mT)6_2WIpjQ3`lX51o;L3hX96q z&3hw(Vw?pYk;M!Qe1}1p@p%4<6rkW*PZ!6K2=}+s4hkJs;BaBx^6$UAc$!DE+p8H* zCQU29b@-gO#oCo|DlCcuP6A91m$PVVUB0Un!qQvJuycJ43#aE}nL{NaPv)4Od-yK! zK*pTp)3X-{=+1EnF?m)AtQVbIyNbsrV_a{o7XJgPX$C+8x&GxLMA&y=y6aDIHeOb(}k^mRa^) WZqy|~GYO!>89ZJ6T-G@yGywqn{(?OK literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CD/Objects/Misc/Lunchboxes/lunchbox_blue.rsi/inhand-right.png b/Resources/Textures/_CD/Objects/Misc/Lunchboxes/lunchbox_blue.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..08b7a3b35a0d7535320d3625c597309bdf35f32c GIT binary patch literal 342 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`031o(uw%JDiX%M>RccyH=I)2MgXq)C&mT)6_2WIpjQ3`lX51o;L3hX96q z&3hw(Vw?pYk;M!Qe1}1p@p%4<6rkW{PZ!6K2=}+w9Qh9`aI_^JvHJhtUT;l>gZ;Ld z^R9iE*Wo+w>=%cX_jMXswy+3YkmFu(`N8rBg%9I$WTu|`d{LA|>oSu-xOA<6MPD-G zlQVAe`hfJ1?6A8W|7 zPIrbI?-n02`N%Lq_lA>0&Ut2sZyz?zac|oHXVzWTFAJ-?)(h-wo!{WU_v8Bf#MS%R btLzz#gma?|cJ0~@bUuTptDnm{r-UW|#Dazn literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CD/Objects/Misc/Lunchboxes/lunchbox_blue.rsi/meta.json b/Resources/Textures/_CD/Objects/Misc/Lunchboxes/lunchbox_blue.rsi/meta.json new file mode 100644 index 0000000000..ac8076132f --- /dev/null +++ b/Resources/Textures/_CD/Objects/Misc/Lunchboxes/lunchbox_blue.rsi/meta.json @@ -0,0 +1,25 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by pwzysk (182643522967437313) on Discord with sprites modified from https://github.com/Baystation12/Baystation12/commit/a929584d9db319eb7484113221be25cfa1d5dc09", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "icon" + }, + { + "name": "icon-open" + } + ] +} diff --git a/Resources/Textures/_CD/Objects/Misc/Lunchboxes/lunchbox_yellow.rsi/icon-open.png b/Resources/Textures/_CD/Objects/Misc/Lunchboxes/lunchbox_yellow.rsi/icon-open.png new file mode 100644 index 0000000000000000000000000000000000000000..c41730e8884155921b3ff556e775060645372ee3 GIT binary patch literal 270 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCil21AIbUi-S0?T)DEonMqfX-OG$?`pktvp^2}zumI)DW`%YFDbA80zu^B+ zz!2ADw_tuHM2*zr~|;7%jU zpMA4=Dwxdqs-)PvtS20(S6<5{Qm)XST>s#V-mVU*)JCrMP@t6zp00i_>zopr0GJ+K AS^xk5 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CD/Objects/Misc/Lunchboxes/lunchbox_yellow.rsi/icon.png b/Resources/Textures/_CD/Objects/Misc/Lunchboxes/lunchbox_yellow.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..51ad08cda520cdd73c199c9b670792b4535d24be GIT binary patch literal 238 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij?1AIbUi-R~{Z(&*A%yi|-6$f3`{||kEGIx(i_yZ~Sk|4j}|6sr%<<0B{ z6yhxKh%9Dc;5!7ujG`J|4M0JEPZ!4!3;(z0F7h!5aI_}2-upjMHfwcvLGI_fDL>P@ zV*WT(1}NQjk44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`0(2Ka=y76)k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`0(2Ka=y76)>~4mcQ{}V-5}vlW z$Y(@lzYX)VGSar4nDDbn_u$+38;Y!&0YMX(R9X4OSln9%7%AD%P}mH|6hnY9F82ykb S-D*ImGkCiCxvX Date: Wed, 24 Jul 2024 23:16:29 +0800 Subject: [PATCH 2/4] Move to respective _CD namespace, and add fork modifier marking --- .../Loadouts/Miscellaneous/trinkets.yml | 21 ------------------- .../Prototypes/Loadouts/loadout_groups.yml | 4 ++-- .../_CD/Loadouts/Miscellaneous/trinkets.yml | 20 ++++++++++++++++++ 3 files changed, 22 insertions(+), 23 deletions(-) create mode 100644 Resources/Prototypes/_CD/Loadouts/Miscellaneous/trinkets.yml diff --git a/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml b/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml index edeef1b5e8..a4e913a20a 100644 --- a/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml +++ b/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml @@ -29,27 +29,6 @@ back: - PlushieSpaceLizard -# CD: Lunchbox -- type: loadout # CD - id: LunchboxBlue - equipment: LunchboxBlue - -- type: startingGear # CD - id: LunchboxBlue - storage: - back: - - LunchboxBlue - -- type: loadout # CD - id: LunchboxYellow - equipment: LunchboxYellow - -- type: startingGear # CD - id: LunchboxYellow - storage: - back: - - LunchboxYellow - # Smokeables - type: loadout id: Lighter diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml index 344e016383..9ac8051c6b 100644 --- a/Resources/Prototypes/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/Loadouts/loadout_groups.yml @@ -7,8 +7,8 @@ loadouts: - PlushieLizard - PlushieSpaceLizard - - LunchboxBlue - - LunchboxYellow + - LunchboxBlue # CD + - LunchboxYellow # CD - Lighter - CigPackGreen - CigPackRed diff --git a/Resources/Prototypes/_CD/Loadouts/Miscellaneous/trinkets.yml b/Resources/Prototypes/_CD/Loadouts/Miscellaneous/trinkets.yml new file mode 100644 index 0000000000..a4efd1d26f --- /dev/null +++ b/Resources/Prototypes/_CD/Loadouts/Miscellaneous/trinkets.yml @@ -0,0 +1,20 @@ +# Lunchboxes +- type: loadout + id: LunchboxBlue + equipment: LunchboxBlue + +- type: startingGear + id: LunchboxBlue + storage: + back: + - LunchboxBlue + +- type: loadout + id: LunchboxYellow + equipment: LunchboxYellow + +- type: startingGear + id: LunchboxYellow + storage: + back: + - LunchboxYellow From 23eb2ce8b014f279cba8eff767956479004c755a Mon Sep 17 00:00:00 2001 From: Rain Caldwell <67359748+Just-a-Unity-Dev@users.noreply.github.com> Date: Mon, 19 Aug 2024 20:44:51 +0800 Subject: [PATCH 3/4] remove toolbox tag --- Resources/Prototypes/_CD/Entities/Objects/Misc/lunchboxes.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/Resources/Prototypes/_CD/Entities/Objects/Misc/lunchboxes.yml b/Resources/Prototypes/_CD/Entities/Objects/Misc/lunchboxes.yml index b27309dcf9..75c39771b3 100644 --- a/Resources/Prototypes/_CD/Entities/Objects/Misc/lunchboxes.yml +++ b/Resources/Prototypes/_CD/Entities/Objects/Misc/lunchboxes.yml @@ -20,9 +20,6 @@ Blunt: 3 soundHit: path: "/Audio/Weapons/smash.ogg" - - type: Tag - tags: - - Toolbox - type: GenericVisualizer visuals: enum.StorageVisuals.Open: From eecda3735136deb5a305926092189036b5a5fd6c Mon Sep 17 00:00:00 2001 From: Rain Caldwell <67359748+Just-a-Unity-Dev@users.noreply.github.com> Date: Mon, 19 Aug 2024 20:51:38 +0800 Subject: [PATCH 4/4] minimize --- .../Prototypes/_CD/Loadouts/Miscellaneous/trinkets.yml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/Resources/Prototypes/_CD/Loadouts/Miscellaneous/trinkets.yml b/Resources/Prototypes/_CD/Loadouts/Miscellaneous/trinkets.yml index a4efd1d26f..f94daf3a18 100644 --- a/Resources/Prototypes/_CD/Loadouts/Miscellaneous/trinkets.yml +++ b/Resources/Prototypes/_CD/Loadouts/Miscellaneous/trinkets.yml @@ -1,19 +1,11 @@ # Lunchboxes - type: loadout - id: LunchboxBlue - equipment: LunchboxBlue - -- type: startingGear id: LunchboxBlue storage: back: - LunchboxBlue - type: loadout - id: LunchboxYellow - equipment: LunchboxYellow - -- type: startingGear id: LunchboxYellow storage: back: