From 14459269a5cfade7e05bdd738236235e6a61c0a8 Mon Sep 17 00:00:00 2001 From: Dvir Date: Thu, 27 Jul 2023 19:42:28 +0300 Subject: [PATCH 1/9] Create hydro_tray.yml --- .../_NF/Entities/Structures/hydro_tray.yml | 79 +++++++++++++++++++ 1 file changed, 79 insertions(+) create mode 100644 Resources/Prototypes/_NF/Entities/Structures/hydro_tray.yml diff --git a/Resources/Prototypes/_NF/Entities/Structures/hydro_tray.yml b/Resources/Prototypes/_NF/Entities/Structures/hydro_tray.yml new file mode 100644 index 00000000000..3aaba64fbb4 --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Structures/hydro_tray.yml @@ -0,0 +1,79 @@ +- type: entity + name: hydroponics tray + parent: [ hydroponicsSoil ] + id: hydroponicsTrayHeavy + suffix: heavy + description: An heavy interstellar-grade space farmplot allowing for rapid growth and selective breeding of crops. Just... keep in mind the space weeds. + components: + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeAabb + bounds: "-0.45,-0.45,0.45,0.1" + density: 190 + hard: true + mask: + - MachineMask +# - type: Anchorable +# - type: Pullable + - type: Sprite + layers: + - sprite: Structures/Hydroponics/containers.rsi + state: hydrotray3 + - sprite: Structures/Hydroponics/overlays.rsi + state: lowhealth3 + map: [ "health_alert" ] + visible: false + - sprite: Structures/Hydroponics/overlays.rsi + state: lowwater3 + map: [ "water_alert" ] + visible: false + - sprite: Structures/Hydroponics/overlays.rsi + state: lownutri3 + map: [ "nutri_alert" ] + visible: false + - sprite: Structures/Hydroponics/overlays.rsi + state: alert3 + map: [ "undefined_alert" ] + visible: false + - sprite: Structures/Hydroponics/overlays.rsi + state: harvest3 + map: [ "harvest_alert" ] + visible: false + - type: Appearance + - type: GenericVisualizer + visuals: + enum.PlantHolderVisuals.HealthLight: + health_alert: + True: { visible: true } + False: { visible: false } + enum.PlantHolderVisuals.WaterLight: + water_alert: + True: { visible: true } + False: { visible: false } + enum.PlantHolderVisuals.NutritionLight: + nutri_alert: + True: { visible: true } + False: { visible: false } + enum.PlantHolderVisuals.AlertLight: + undefined_alert: + True: { visible: true } + False: { visible: false } + enum.PlantHolderVisuals.HarvestLight: + harvest_alert: + True: { visible: true } + False: { visible: false } + - type: PlantHolder + drawWarnings: true +# - type: Machine +# board: HydroponicsTrayMachineCircuitboard +# - type: WiresPanel +# - type: Wires +# BoardName: "HydroponicsTray" +# LayoutId: HydroponicsTray + - type: AmbientSound + volume: -9 + range: 5 + sound: + path: /Audio/Ambience/Objects/flowing_water_open.ogg From 1fd29a0435ccdf1f96b2493b40ca92df0338832c Mon Sep 17 00:00:00 2001 From: Dvir Date: Thu, 27 Jul 2023 19:43:09 +0300 Subject: [PATCH 2/9] Removed empty lines --- .../Prototypes/_NF/Entities/Structures/hydro_tray.yml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/Resources/Prototypes/_NF/Entities/Structures/hydro_tray.yml b/Resources/Prototypes/_NF/Entities/Structures/hydro_tray.yml index 3aaba64fbb4..cec3aac5609 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/hydro_tray.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/hydro_tray.yml @@ -15,8 +15,6 @@ hard: true mask: - MachineMask -# - type: Anchorable -# - type: Pullable - type: Sprite layers: - sprite: Structures/Hydroponics/containers.rsi @@ -66,12 +64,6 @@ False: { visible: false } - type: PlantHolder drawWarnings: true -# - type: Machine -# board: HydroponicsTrayMachineCircuitboard -# - type: WiresPanel -# - type: Wires -# BoardName: "HydroponicsTray" -# LayoutId: HydroponicsTray - type: AmbientSound volume: -9 range: 5 From f4155be953f0fd9e80a43161a56e268bba824b9a Mon Sep 17 00:00:00 2001 From: Dvir Date: Thu, 27 Jul 2023 19:47:34 +0300 Subject: [PATCH 3/9] Update hydro_tray.yml --- .../Prototypes/_NF/Entities/Structures/hydro_tray.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Resources/Prototypes/_NF/Entities/Structures/hydro_tray.yml b/Resources/Prototypes/_NF/Entities/Structures/hydro_tray.yml index cec3aac5609..ecefa79e378 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/hydro_tray.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/hydro_tray.yml @@ -64,6 +64,16 @@ False: { visible: false } - type: PlantHolder drawWarnings: true + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 100 + behaviors: + - !type:ChangeConstructionNodeBehavior + node: machineFrame + - !type:DoActsBehavior + acts: ["Destruction"] - type: AmbientSound volume: -9 range: 5 From c4fc491fb0f6ab3c7dcf1cfce26fc7f5033e1451 Mon Sep 17 00:00:00 2001 From: Dvir Date: Sat, 29 Jul 2023 16:32:54 +0300 Subject: [PATCH 4/9] GentleJester Sprites --- .../_NF/Entities/Structures/hydro_tray.yml | 4 ++-- .../Hydroponics/containers.rsi/hydrotrayheavy.png | Bin 0 -> 542 bytes .../Hydroponics/containers.rsi/meta.json | 14 ++++++++++++++ 3 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 Resources/Textures/_NF/Structures/Hydroponics/containers.rsi/hydrotrayheavy.png create mode 100644 Resources/Textures/_NF/Structures/Hydroponics/containers.rsi/meta.json diff --git a/Resources/Prototypes/_NF/Entities/Structures/hydro_tray.yml b/Resources/Prototypes/_NF/Entities/Structures/hydro_tray.yml index ecefa79e378..200f77ed65b 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/hydro_tray.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/hydro_tray.yml @@ -17,8 +17,8 @@ - MachineMask - type: Sprite layers: - - sprite: Structures/Hydroponics/containers.rsi - state: hydrotray3 + - sprite: _NF/Structures/Hydroponics/containers.rsi + state: hydrotrayheavy - sprite: Structures/Hydroponics/overlays.rsi state: lowhealth3 map: [ "health_alert" ] diff --git a/Resources/Textures/_NF/Structures/Hydroponics/containers.rsi/hydrotrayheavy.png b/Resources/Textures/_NF/Structures/Hydroponics/containers.rsi/hydrotrayheavy.png new file mode 100644 index 0000000000000000000000000000000000000000..4e8fb8f5eac8bb78262b87cd1ccd10d49dd09819 GIT binary patch literal 542 zcmV+(0^$9MP)Px$zDYzuR9J=Wl`)9ZP#DL5scDmdFGbMEA#sribuBd0In|pS>>#*^tKQ&Xaq6N& zC#i$O*->ygaFAOagbX*NXIBS{Q-)v^ue~Rv?TK-yEe)=(IGEq^@&4a?@Be)dJ{}Yl z6ciK`6cqgLXzPnkr<1v^%V;zL!1Fw!C_=T??RK@l3TU_6*~Kjf$GNc4j+5joU*d#b zucra%%Y^57SeC`T@=ch{;nx&Sr)pfwCX`GtD!g(Iu+LUkDGlK9qlej*tJk=H{w|y( zkRC%iQ)9lwGQc_qwnP8hYd(Ma$g}4!G(ETJ$H~I{cnqAXEnr$+#FCklO8{~59f1Dy z;7{j@&0%q8I$L=gXW<{Sp^fVC-bT{pXPyM;{Wxw?f_ zQLgR3c}o;U`6)0AgZIH9QcBV^1;DZ_gb>O#!!T9_=>YY5J!|+rgD@nH<5hAz9wUTM zuHD$#p<1nG!{JcV*Uf9S8k5N+_hg&U24P6U_W?5P!R~H02*cF|Aw=$glv262q~ZIV z`EYdf^j53&q}gm@m?qb^w~ Date: Tue, 8 Aug 2023 15:36:35 +0300 Subject: [PATCH 5/9] Update hydro_tray.yml Name change --- Resources/Prototypes/_NF/Entities/Structures/hydro_tray.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/_NF/Entities/Structures/hydro_tray.yml b/Resources/Prototypes/_NF/Entities/Structures/hydro_tray.yml index 200f77ed65b..b729e2b22de 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/hydro_tray.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/hydro_tray.yml @@ -1,8 +1,8 @@ - type: entity name: hydroponics tray parent: [ hydroponicsSoil ] - id: hydroponicsTrayHeavy - suffix: heavy + id: hydroponicsTrayAnchored + suffix: anchored description: An heavy interstellar-grade space farmplot allowing for rapid growth and selective breeding of crops. Just... keep in mind the space weeds. components: - type: Fixtures From 02d7802bfc6b433df13dd9250ced9ff1852a279f Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Tue, 8 Aug 2023 15:37:06 +0300 Subject: [PATCH 6/9] Update meta.json --- .../_NF/Structures/Hydroponics/containers.rsi/meta.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Textures/_NF/Structures/Hydroponics/containers.rsi/meta.json b/Resources/Textures/_NF/Structures/Hydroponics/containers.rsi/meta.json index f877c9fd8f8..6b250e3e535 100644 --- a/Resources/Textures/_NF/Structures/Hydroponics/containers.rsi/meta.json +++ b/Resources/Textures/_NF/Structures/Hydroponics/containers.rsi/meta.json @@ -8,7 +8,7 @@ }, "states": [ { - "name": "hydrotrayheavy" + "name": "hydrotrayanchored" } ] } From e1f162172f9bab14cebd9f10b5efe8e9b465e34a Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Tue, 8 Aug 2023 15:38:35 +0300 Subject: [PATCH 7/9] Update hydro_tray.yml --- Resources/Prototypes/_NF/Entities/Structures/hydro_tray.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_NF/Entities/Structures/hydro_tray.yml b/Resources/Prototypes/_NF/Entities/Structures/hydro_tray.yml index b729e2b22de..c68eacf15e5 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/hydro_tray.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/hydro_tray.yml @@ -3,7 +3,7 @@ parent: [ hydroponicsSoil ] id: hydroponicsTrayAnchored suffix: anchored - description: An heavy interstellar-grade space farmplot allowing for rapid growth and selective breeding of crops. Just... keep in mind the space weeds. + description: An anchored interstellar-grade space farmplot allowing for rapid growth and selective breeding of crops. Just... keep in mind the space weeds. components: - type: Fixtures fixtures: From e5af0b3a0f6eac594b2b24b9f543433fc047e3e9 Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Tue, 8 Aug 2023 23:52:22 +0300 Subject: [PATCH 8/9] Update hydro_tray.yml --- Resources/Prototypes/_NF/Entities/Structures/hydro_tray.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_NF/Entities/Structures/hydro_tray.yml b/Resources/Prototypes/_NF/Entities/Structures/hydro_tray.yml index c68eacf15e5..e68159593f0 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/hydro_tray.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/hydro_tray.yml @@ -18,7 +18,7 @@ - type: Sprite layers: - sprite: _NF/Structures/Hydroponics/containers.rsi - state: hydrotrayheavy + state: hydrotrayanchored - sprite: Structures/Hydroponics/overlays.rsi state: lowhealth3 map: [ "health_alert" ] From 98deb29aaa012e6393a150a2da50a1518081c2e0 Mon Sep 17 00:00:00 2001 From: Dvir Date: Tue, 8 Aug 2023 23:58:35 +0300 Subject: [PATCH 9/9] Small placeholder change --- .../containers.rsi/hydrotrayanchored.png | Bin 0 -> 406 bytes .../Hydroponics/containers.rsi/hydrotrayheavy.png | Bin 542 -> 0 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 Resources/Textures/_NF/Structures/Hydroponics/containers.rsi/hydrotrayanchored.png delete mode 100644 Resources/Textures/_NF/Structures/Hydroponics/containers.rsi/hydrotrayheavy.png diff --git a/Resources/Textures/_NF/Structures/Hydroponics/containers.rsi/hydrotrayanchored.png b/Resources/Textures/_NF/Structures/Hydroponics/containers.rsi/hydrotrayanchored.png new file mode 100644 index 0000000000000000000000000000000000000000..b8c1fa32075ecf806843199ddcaa051d8b1b1e95 GIT binary patch literal 406 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCil00(?STgMxz6($ai=ePiNcvU9U?a&j1!zhzkPoMGO5hMCv>e7qRed}Ww= zj-lr`L(4vfmYsHXcEZBK0YQFZ!u&up+}zwGBqWrSlq4l3-Q3+dIXShpwUd&PfKugk zL92k2TuG2$@PB-O;f;h$98e`^fk$L90|Vb75M~tB@M-`G&h~V146*QkJJC_7S%HUv zGiqU%l#c1LqyOtS2UcfFAGbST`-b7BH=D710h@IChL7P12ciPDvToBT*LWj!U}@36 zU(MyAoZbP>kDXTw)G&XQ+Hv74S8PFc1H;?jFT2GUR67p;6FcnNB=UOq0Px$zDYzuR9J=Wl`)9ZP#DL5scDmdFGbMEA#sribuBd0In|pS>>#*^tKQ&Xaq6N& zC#i$O*->ygaFAOagbX*NXIBS{Q-)v^ue~Rv?TK-yEe)=(IGEq^@&4a?@Be)dJ{}Yl z6ciK`6cqgLXzPnkr<1v^%V;zL!1Fw!C_=T??RK@l3TU_6*~Kjf$GNc4j+5joU*d#b zucra%%Y^57SeC`T@=ch{;nx&Sr)pfwCX`GtD!g(Iu+LUkDGlK9qlej*tJk=H{w|y( zkRC%iQ)9lwGQc_qwnP8hYd(Ma$g}4!G(ETJ$H~I{cnqAXEnr$+#FCklO8{~59f1Dy z;7{j@&0%q8I$L=gXW<{Sp^fVC-bT{pXPyM;{Wxw?f_ zQLgR3c}o;U`6)0AgZIH9QcBV^1;DZ_gb>O#!!T9_=>YY5J!|+rgD@nH<5hAz9wUTM zuHD$#p<1nG!{JcV*Uf9S8k5N+_hg&U24P6U_W?5P!R~H02*cF|Aw=$glv262q~ZIV z`EYdf^j53&q}gm@m?qb^w~