From 6630e002a187b02f53079035d9be89d9e746e9aa Mon Sep 17 00:00:00 2001 From: Dvir Date: Thu, 25 Jan 2024 00:46:08 +0200 Subject: [PATCH 1/4] Plant Box --- .../Entities/Structures/Storage/ore_box.yml | 21 ++--- .../Entities/Structures/Storage/plant_box.yml | 82 ++++++++++++++++++ .../Structures/Storage/plantbox.rsi/meta.json | 17 ++++ .../Storage/plantbox.rsi/plantbox-top.png | Bin 0 -> 523 bytes .../Storage/plantbox.rsi/plantbox.png | Bin 0 -> 790 bytes 5 files changed, 107 insertions(+), 13 deletions(-) create mode 100644 Resources/Prototypes/_NF/Entities/Structures/Storage/plant_box.yml create mode 100644 Resources/Textures/_NF/Structures/Storage/plantbox.rsi/meta.json create mode 100644 Resources/Textures/_NF/Structures/Storage/plantbox.rsi/plantbox-top.png create mode 100644 Resources/Textures/_NF/Structures/Storage/plantbox.rsi/plantbox.png diff --git a/Resources/Prototypes/Entities/Structures/Storage/ore_box.yml b/Resources/Prototypes/Entities/Structures/Storage/ore_box.yml index 61f62f230b0..82ea8e8cb31 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/ore_box.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/ore_box.yml @@ -1,13 +1,11 @@ - type: entity id: OreBox name: ore box - # description: A large storage container for holding unprocessed ores. - description: A large storage container for collecting and holding unprocessed ores and fragments. # Frontier + description: A large storage container for collecting and holding unprocessed ores and fragments. # Frontier - was: A large storage container for holding unprocessed ores. parent: BaseStructureDynamic components: - type: StaticPrice - # price: 500 - price: 1000 # Frontier + price: 625 # Frontier - 500<625 - type: Anchorable - type: InteractionOutline - type: Damageable @@ -17,15 +15,13 @@ thresholds: - trigger: !type:DamageTrigger - # damage: 150 - damage: 450 # Frontier + damage: 450 # Frontier - 150<450 behaviors: - !type:DoActsBehavior acts: [ "Destruction" ] - trigger: !type:DamageTrigger - # damage: 100 - damage: 300 # Frontier + damage: 300 # Frontier 100<300 behaviors: - !type:EmptyAllContainersBehaviour - !type:SpawnEntitiesBehavior @@ -54,14 +50,13 @@ True: { visible: false } False: { visible: true } - type: Storage - # capacity: 525 - capacity: 900 # Frontier + capacity: 900 # Frontier - 525<900 storageOpenSound: /Audio/Effects/closetopen.ogg storageCloseSound: /Audio/Effects/closetclose.ogg whitelist: tags: - Ore - - ArtifactFragment # Frontier + - ArtifactFragment # Frontier - type: UserInterface interfaces: - key: enum.StorageUiKey.Key @@ -70,9 +65,9 @@ containers: storagebase: !type:Container ents: [ ] - - type: Dumpable # Frontier + - type: Dumpable # Frontier - type: MagnetPickup # Frontier - range: 1.5 # Ore bag has a range of 1.0 + range: 1.5 # Ore bag has a range of 1.0 - type: Fixtures fixtures: fix1: diff --git a/Resources/Prototypes/_NF/Entities/Structures/Storage/plant_box.yml b/Resources/Prototypes/_NF/Entities/Structures/Storage/plant_box.yml new file mode 100644 index 00000000000..865a0b4f6c6 --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Structures/Storage/plant_box.yml @@ -0,0 +1,82 @@ +- type: entity + id: PlantBox + name: plant box + description: A large storage container for holding plants and seeds. + parent: BaseStructureDynamic + components: + - type: StaticPrice + price: 625 + - type: Anchorable + - type: InteractionOutline + - type: Damageable + damageContainer: Inorganic + damageModifierSet: Wood + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 450 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - trigger: + !type:DamageTrigger + damage: 300 + behaviors: + - !type:EmptyAllContainersBehaviour + - !type:SpawnEntitiesBehavior + spawn: + MaterialWoodPlank1: + min: 3 + max: 5 + - !type:DoActsBehavior + acts: [ "Destruction" ] + - type: Climbable + + # plantbox-specific + - type: Sprite + noRot: true + sprite: _NF/Structures/Storage/plantbox.rsi + layers: + - state: plantbox + - state: plantbox-top + map: [ top ] + visible: true + - type: Appearance + - type: GenericVisualizer + visuals: + enum.StorageVisuals.Open: + top: + True: { visible: false } + False: { visible: true } + - type: Storage + capacity: 900 + storageOpenSound: /Audio/Effects/closetopen.ogg + storageCloseSound: /Audio/Effects/closetclose.ogg + whitelist: + components: + - Produce + - Seed + - type: UserInterface + interfaces: + - key: enum.StorageUiKey.Key + type: StorageBoundUserInterface + - type: ContainerContainer + containers: + storagebase: !type:Container + ents: [ ] + - type: Dumpable + - type: MagnetPickup + range: 1.5 # plant bag has a range of 1.0 + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeCircle + radius: 0.3 + # very not dense to make it easy to pull + density: 20 + mask: + - SmallMobMask + layer: + - MachineLayer diff --git a/Resources/Textures/_NF/Structures/Storage/plantbox.rsi/meta.json b/Resources/Textures/_NF/Structures/Storage/plantbox.rsi/meta.json new file mode 100644 index 00000000000..e15111a58e9 --- /dev/null +++ b/Resources/Textures/_NF/Structures/Storage/plantbox.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Made for Frontier by gentlebutter", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "plantbox" + }, + { + "name": "plantbox-top" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_NF/Structures/Storage/plantbox.rsi/plantbox-top.png b/Resources/Textures/_NF/Structures/Storage/plantbox.rsi/plantbox-top.png new file mode 100644 index 0000000000000000000000000000000000000000..2a7b1fa96ebecbadc62b207b3d17fb7bce273e5f GIT binary patch literal 523 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|o&@-WxGE_r znX1W~o0}(^Dux=Xl$uK#85t?b$_WVxc^Rm1b93wH=mZ(7_!z3hm?~*%YI^9a_#3G@ z=qLr4s7G6A9O7W9Bra(yr_>WdW1WUf`-Wt8AyGWT&YJ^Z^hEfPti>q^^RLsk(xpimaxrgq6Cy zo1U_rrh=-9imASCjMz?jpi-ZbAiv=M6aj|+%4!G$7B2R62AZ4f>Eak-(ffA7MqUO* z9_Euw({xkky}wz%uzb~YCr9VcLI*udZ!~_)$&z6XQiyOCNHuLRepS=T%8(#!uIsAT zP|Lexv(X~=0}ZxW5l0?1+??I=<8h d&op0O1}z|)1BgN3Qt)ID<>~6@vd$@?2>|Rry|w@V literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Storage/plantbox.rsi/plantbox.png b/Resources/Textures/_NF/Structures/Storage/plantbox.rsi/plantbox.png new file mode 100644 index 0000000000000000000000000000000000000000..5473f610bb3520bbf5e0892b10846159621e0b17 GIT binary patch literal 790 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|o&@-WxGE_r znX1W~o0}(^Dux=Xl$uK#85t?b$_WVxc^Rm1b93wH=mZ(7_!z3hm?~*%YI^9a_#3G@ z=qLr4s7G6A9O7W9Bra(yr_>WdW1WUf`-Wt8AyGWT&YJ^Z^hEfPti>q^^RLsk(xpimaxrgq6Cy zo1U_rrh=-9imASCjMz?jpi-ZbAiv=M6aj|+%4!G$7B2R628L;#r;B5VMeo!}5A&K0 zcv>bm-YU&qU$*jFeKqH`ytn-x3X1ps*Or+rZBfjlZP3O-T)$<`Bpr7TxPm5w&!R9H$K{v!sAiRh)*es#VUT(@ui3^O$z2Uii!Z zWAl;s4L`TAq`9qSQ#Y1>@$Sjt2PuJ5>>kXr-nsNp-uC;qZ&)U5Jj@~!^y%;{k)T=3 zOrcMG3v9YNw4OOQur>zn37xvf$(b$SLS?6U%6!R>a*Bch{||3&kB_;#%)m{ z(;DVIIvI9I|3)#}6&8u$)xxz&=fASl%-MPB@txDm2_-CM>9?0mZOc9QU7^RUe8Eb6 zu?<{43m+|2xi+11huis_{6w>=wqI6Ex*Q%~%$x6@suH|jW|LRev;4fu&dGb{w(^O6 z;%?jjM~5dN%37!Iy#7~Dwl$W#_P-iax3_PZ*tYhMz z_h%lSWt)1y{F`uULKyRdr@$EHOO5bM^YvxW0 Date: Thu, 15 Feb 2024 18:10:18 +0200 Subject: [PATCH 2/4] Update plant_box.yml --- .../Prototypes/_NF/Entities/Structures/Storage/plant_box.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/_NF/Entities/Structures/Storage/plant_box.yml b/Resources/Prototypes/_NF/Entities/Structures/Storage/plant_box.yml index 865a0b4f6c6..f9d7fcfc73d 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Storage/plant_box.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Storage/plant_box.yml @@ -50,7 +50,10 @@ True: { visible: false } False: { visible: true } - type: Storage - capacity: 900 + capacity: 900 # Frontier - 525<900 + grid: + - 0,0,9,5 + maxItemSize: Normal storageOpenSound: /Audio/Effects/closetopen.ogg storageCloseSound: /Audio/Effects/closetclose.ogg whitelist: From 6084776cbb4f418bbabdcf3f1e57ee9bd20cde61 Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Mon, 19 Feb 2024 23:24:07 +0200 Subject: [PATCH 3/4] Update ore_box.yml --- Resources/Prototypes/Entities/Structures/Storage/ore_box.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Structures/Storage/ore_box.yml b/Resources/Prototypes/Entities/Structures/Storage/ore_box.yml index d91c9ce5b91..988c5486ae5 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/ore_box.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/ore_box.yml @@ -50,7 +50,6 @@ True: { visible: false } False: { visible: true } - type: Storage - capacity: 900 # Frontier - 525<900 grid: - 0,0,9,5 maxItemSize: Normal From 7a7574785ae9caed68c1761d98a1fd6675252f57 Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Mon, 19 Feb 2024 23:24:34 +0200 Subject: [PATCH 4/4] Update plant_box.yml --- .../Prototypes/_NF/Entities/Structures/Storage/plant_box.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/Resources/Prototypes/_NF/Entities/Structures/Storage/plant_box.yml b/Resources/Prototypes/_NF/Entities/Structures/Storage/plant_box.yml index f9d7fcfc73d..f57d4acb4de 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Storage/plant_box.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Storage/plant_box.yml @@ -50,7 +50,6 @@ True: { visible: false } False: { visible: true } - type: Storage - capacity: 900 # Frontier - 525<900 grid: - 0,0,9,5 maxItemSize: Normal