From 8d3bc49fc736258958e0fb02f3639b71ee2c946a Mon Sep 17 00:00:00 2001 From: Trest <144359854+trest100@users.noreply.github.com> Date: Thu, 1 Aug 2024 03:34:55 +0300 Subject: [PATCH] Bochka (#512) * just barrel * add Barrels for liquids * Fix1 * Update Sprite Beer * fixes * fix2 * fix3 --- .../Entities/Structures/Storage/Barrel.yml | 74 ++++++++++++++++++ .../Structures/Storage/Barrel_Beer.yml | 30 +++++++ .../Objects/Storage/Barrel.rsi/Barrel-top.png | Bin 0 -> 230 bytes .../Objects/Storage/Barrel.rsi/Barrel.png | Bin 0 -> 692 bytes .../Objects/Storage/Barrel.rsi/meta.json | 17 ++++ .../Storage/Barrel_Beer.rsi/Barrel_Beer.png | Bin 0 -> 823 bytes .../Objects/Storage/Barrel_Beer.rsi/meta.json | 14 ++++ 7 files changed, 135 insertions(+) create mode 100644 Resources/Prototypes/_White/Entities/Structures/Storage/Barrel.yml create mode 100644 Resources/Prototypes/_White/Entities/Structures/Storage/Barrel_Beer.yml create mode 100644 Resources/Textures/White/Objects/Storage/Barrel.rsi/Barrel-top.png create mode 100644 Resources/Textures/White/Objects/Storage/Barrel.rsi/Barrel.png create mode 100644 Resources/Textures/White/Objects/Storage/Barrel.rsi/meta.json create mode 100644 Resources/Textures/White/Objects/Storage/Barrel_Beer.rsi/Barrel_Beer.png create mode 100644 Resources/Textures/White/Objects/Storage/Barrel_Beer.rsi/meta.json diff --git a/Resources/Prototypes/_White/Entities/Structures/Storage/Barrel.yml b/Resources/Prototypes/_White/Entities/Structures/Storage/Barrel.yml new file mode 100644 index 0000000000..3ce92ea2de --- /dev/null +++ b/Resources/Prototypes/_White/Entities/Structures/Storage/Barrel.yml @@ -0,0 +1,74 @@ +- type: entity + id: Barrel + name: Бочка + description: Большой обьект для хранения. + parent: BaseStructureDynamic + components: + - type: StaticPrice + price: 500 + - type: Anchorable + - type: InteractionOutline + - type: Damageable + damageContainer: StructuralInorganic + damageModifierSet: Wood + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 150 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - trigger: + !type:DamageTrigger + damage: 100 + behaviors: + - !type:EmptyAllContainersBehaviour + - !type:SpawnEntitiesBehavior + spawn: + MaterialWoodPlank1: + min: 3 + max: 5 + - !type:DoActsBehavior + acts: [ "Destruction" ] + - type: Climbable + - type: Sprite + noRot: true + sprite: /Textures/White/Objects/Storage/Barrel.rsi + layers: + - state: Barrel + - state: Barrel-top + map: [ top ] + visible: true + - type: Appearance + - type: GenericVisualizer + visuals: + enum.StorageVisuals.Open: + top: + True: { visible: false } + False: { visible: true } + - type: Storage + grid: + - 0,0,9,5 + storageOpenSound: /Audio/Effects/closetopen.ogg + storageCloseSound: /Audio/Effects/closetclose.ogg + - type: UserInterface + interfaces: + - key: enum.StorageUiKey.Key + type: StorageBoundUserInterface + - type: ContainerContainer + containers: + storagebase: !type:Container + ents: [ ] + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeCircle + radius: 0.3 + # very not dense to make it easy to pull + density: 20 + mask: + - MachineMask + layer: + - MachineLayer diff --git a/Resources/Prototypes/_White/Entities/Structures/Storage/Barrel_Beer.yml b/Resources/Prototypes/_White/Entities/Structures/Storage/Barrel_Beer.yml new file mode 100644 index 0000000000..5774f5e45b --- /dev/null +++ b/Resources/Prototypes/_White/Entities/Structures/Storage/Barrel_Beer.yml @@ -0,0 +1,30 @@ +- type: entity + id: Barrel_Beer_Empty + parent: [StorageTank, StructureWheeled] + name: бочка пива + description: Изготовлено древними дворфами + suffix: Empty + components: + - type: StaticPrice + price: 750 + - type: Sprite + sprite: /Textures/White/Objects/Storage/Barrel_Beer.rsi + layers: + - state: Barrel_Beer + - type: Appearance + - type: ExaminableSolution + solution: tank + - type: ReagentTank + tankType: Fuel + +- type: entity + id: Barrel_Beer_Full + parent: Barrel_Beer_Empty + suffix: Full + components: + - type: SolutionContainerManager + solutions: + tank: + reagents: + - ReagentId: Beer + Quantity: 1500 diff --git a/Resources/Textures/White/Objects/Storage/Barrel.rsi/Barrel-top.png b/Resources/Textures/White/Objects/Storage/Barrel.rsi/Barrel-top.png new file mode 100644 index 0000000000000000000000000000000000000000..4bab4f8bdd8bd86ad649100f3f6132f10fc72c08 GIT binary patch literal 230 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}EX7WqAsj$Z z!;#Vf37*R9-1{$+qO5v4MesN7sji9rpE~I~#!@@mZg?%1qBG zNi&w75cB5xyvXXo+jNn3f!7jETp$gPH;J%)o4@mdK II;Vst06V5jE&u=k literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Objects/Storage/Barrel.rsi/Barrel.png b/Resources/Textures/White/Objects/Storage/Barrel.rsi/Barrel.png new file mode 100644 index 0000000000000000000000000000000000000000..265af3c9118aef32d6406f0f7c5ee8946afe621b GIT binary patch literal 692 zcmV;l0!#ggP)6vxLZ_^c>bqZe@#E=s|Tg@7RL-F4^MouA1sQrwFmMB9xEUj#uUH5hDdr55oq zze)a=x#P^_1{c}nKss~Y|9j?~Q)8C2tiXaRaBSZEkM7_4gHL(se8YA4<(uOlKY2A* z%vQ!qN`{Z)Lzif{J2@R=|CAR_yX*C0a>BF$GZO&Gm6V`LeDLEJY)$7*9d~yDfdR}c z5GU#gkqgPgQoq|daF&NZj{=XAj`u5oFEMf;vH+BUK)mt#&1(`RdjOlQH=q8|*N(wu zCE%lMS*+G_fk4Kusw#J4ARTw#2R=nf02><*UHJ*b7b*DJi&yHe<1V5~;_E5^(#nY? zyYS3D!S?~`Y zd-bjJV*2TW7`Z<0uaH~>F6YrP3Vh0whyuuP%usc z(&bN|Z#5>u>85(7<=&lj^Zn~*#H}bfhAD5ARU?O;?$V`vWAeEH#De^fEDC_PVh8ZH zS}I`@zs&w!c3NJ7Nlp%WOlh^#L$a+GbtPx#1am@3R0s$N2z&@+hyVZr$4Nv%R9J=Wm%C0IK@^5RP*9{8TUcwrBSaBr6of;G@C+&P3~3OJAAp7?qOg=Im5trFfQW302yL*i9B^E$km3~MS$oZ1 zArcLLH8bb-pV{4W&cYL(@W_}-YOuS#HUJR0jOX0Gx&dJSxRuCfEM*;ZJg_j*UILw- zhe%v9kqW!pYlEPm8ebaU0eEM=xm7->WM|R`Usl6*ED-jSlxubUt?vY@nZEopDhazp?aYN3WWjyhGB5p z*;I$uz`W#IuK}hd%)`m`a6Poquq-P%fqcJ$WtCkA8yg!Q`NG12XWwqOJ^Na%=JA!7 z099B=8QMTCP|+WGr;eCy!6DdN!Fs*~cDERaDu^9u`~b5G_Dls1ffCriLCZN%1Z_Z+ zP&%k5-`D~ZU{3kmuimXYu|7ipkp+ngZdO%*)N@Foh?ql}9PZ;HHUXDN71&XMHBtxa zOw9QhM34z4PzrETnp6b#fP=Ap(Ao!qHM&?V57uWYi0tq^c&V=Z{Fizhp!R%%{*a{I z1(}Dw1C5_+n9D8fE;Mh;9354BV}%!@+cM2I6y6lz&j2VIEXhNmAz zz*C6$I1((6Y7hW3z$~2THUFa!Id!z%gA0*UPfh?}J^c+(t+tl166Kw`+q7&aSTAxQ z@$2vQ)eX8+f*MBj*|?6jeegg6qyDa1?m5CpyX{x^J1Hgo?xjm04k8PY-RXr+LVnQm zgC5iFO<@1HHDzDjcpUY+mq;nGJH1i1ot`IqeHLdZjl2O(0*G}BS|?6$c)*WI5R(3w zJUadX$=ot