From cf61150ebd0243130255da156f8f88caf13f52b6 Mon Sep 17 00:00:00 2001 From: Lei Yunxing Date: Fri, 31 Mar 2023 12:21:54 +0800 Subject: [PATCH] Adds advanced mop and research (#14917) * add advanced mop * make advmop clean faster * works now * tweak stats * tweak speed again * typo!!! * copyright change for nerds --- .../catalog/research/technologies.ftl | 5 ++- .../Catalog/Research/technologies.yml | 17 ++++++++-- .../Objects/Specific/Janitorial/janitor.yml | 29 ++++++++++++++++++ .../Entities/Structures/Machines/lathe.yml | 3 +- .../Prototypes/Recipes/Lathes/janitorial.yml | 9 ++++++ .../Specific/Janitorial/advmop.rsi/advmop.png | Bin 0 -> 1624 bytes .../Janitorial/advmop.rsi/inhand-left.png | Bin 0 -> 809 bytes .../Janitorial/advmop.rsi/inhand-right.png | Bin 0 -> 829 bytes .../Specific/Janitorial/advmop.rsi/meta.json | 22 +++++++++++++ 9 files changed, 81 insertions(+), 4 deletions(-) create mode 100644 Resources/Textures/Objects/Specific/Janitorial/advmop.rsi/advmop.png create mode 100644 Resources/Textures/Objects/Specific/Janitorial/advmop.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Specific/Janitorial/advmop.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Specific/Janitorial/advmop.rsi/meta.json diff --git a/Resources/Locale/en-US/prototypes/catalog/research/technologies.ftl b/Resources/Locale/en-US/prototypes/catalog/research/technologies.ftl index 2f3bcbf717..9bddde00fb 100644 --- a/Resources/Locale/en-US/prototypes/catalog/research/technologies.ftl +++ b/Resources/Locale/en-US/prototypes/catalog/research/technologies.ftl @@ -4,6 +4,9 @@ technologies-basic-research-technology-description = Nanotrasen basic research t technologies-cleaning-technology = Cleaning technology technologies-cleaning-technology-description = Start to a shiny clean station. +technologies-advanced-cleaning-technology = Advanced cleaning technology +technologies-advanced-cleaning-technology-description = Advanced mop won't stop people from trashing the station, sadly. + technologies-foodbev-technology = Food and beverage technology technologies-food-and-beverage-technology-description = Robust service from better technology. @@ -89,4 +92,4 @@ technologies-adv-parts-technology-description = Like the previous ones, but bett technologies-adv-parts-technology = Advanced parts technology technologies-super-parts-technology = Super parts technology -technologies-super-parts-technology-description = New heights of machine performance. \ No newline at end of file +technologies-super-parts-technology-description = New heights of machine performance. diff --git a/Resources/Prototypes/Catalog/Research/technologies.yml b/Resources/Prototypes/Catalog/Research/technologies.yml index 08156f9437..5c605abffc 100644 --- a/Resources/Prototypes/Catalog/Research/technologies.yml +++ b/Resources/Prototypes/Catalog/Research/technologies.yml @@ -16,7 +16,7 @@ - type: technology name: technologies-cleaning-technology - id: MopBucket + id: CleaningTechnology description: technologies-cleaning-technology-description icon: sprite: Objects/Specific/Janitorial/janitorial.rsi @@ -29,6 +29,19 @@ - MopItem - SprayBottle - BodyBag +- type: technology + name: technologies-advanced-cleaning-technology + id: AdvancedCleaningTechnology + description: technologies-advanced-cleaning-technology-description + icon: + sprite: Objects/Specific/Janitorial/advmop.rsi + state: advmop + requiredPoints: 5000 + requiredTechnologies: + - BasicResearch + - CleaningTechnology + unlockedRecipes: + - AdvMopItem # Food/Bev Service Technology Tree @@ -600,4 +613,4 @@ - SuperMatterBinStockPart - UltraHighPowerMicroLaserStockPart - PicoManipulatorStockPart - - PhasicScanningModuleStockPart \ No newline at end of file + - PhasicScanningModuleStockPart diff --git a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml index 6c087ed0c5..17a9b504dc 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml @@ -30,6 +30,35 @@ - DroneUsable #No bucket because it holds chems, they can drag the cart or use a drain - Mop +- type: entity + parent: BaseItem + name: advanced mop + id: AdvMopItem + description: Motorized mop that have a bigger reservoir and can mop multiple puddles at once. Automatic Clown Countermeasure no included. + components: + - type: Sprite + sprite: Objects/Specific/Janitorial/advmop.rsi + state: advmop + - type: MeleeWeapon + damage: + types: + Blunt: 10 + - type: Item + size: 15 + sprite: Objects/Specific/Janitorial/advmop.rsi + - type: Absorbent + maxEntities: 3 + pickupAmount: 25 + speed: 12.5 + - type: SolutionContainerManager + solutions: + absorbed: + maxVol: 100 + - type: Tag + tags: + - DroneUsable #No bucket because it holds chems, they can drag the cart or use a drain + - Mop + - type: entity name: mop bucket id: MopBucket diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 582b9ce04b..f7599c12c9 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -219,6 +219,7 @@ - MailingUnitElectronics - Bucket - MopItem + - AdvMopItem - SprayBottle - FireExtinguisher - KitchenKnife @@ -232,7 +233,7 @@ - VoiceTrigger - PowerCellSmall - PowerCellMedium - - PowerCellHigh + - PowerCellHigh - SynthesizerInstrument - RPED - NodeScanner diff --git a/Resources/Prototypes/Recipes/Lathes/janitorial.yml b/Resources/Prototypes/Recipes/Lathes/janitorial.yml index 26d0d67e4f..4c537c30e5 100644 --- a/Resources/Prototypes/Recipes/Lathes/janitorial.yml +++ b/Resources/Prototypes/Recipes/Lathes/janitorial.yml @@ -48,3 +48,12 @@ materials: Steel: 100 Glass: 1000 + +- type: latheRecipe + id: AdvMopItem + result: AdvMopItem + completetime: 2 + materials: + Plastic: 100 + Steel: 100 + Glass: 100 diff --git a/Resources/Textures/Objects/Specific/Janitorial/advmop.rsi/advmop.png b/Resources/Textures/Objects/Specific/Janitorial/advmop.rsi/advmop.png new file mode 100644 index 0000000000000000000000000000000000000000..6abe16904d2ba36dafc30935bc46be35e34c8e56 GIT binary patch literal 1624 zcmbVMTWl0n7@lV9rG=`oR81f1bTF~V&dzOVcSZ&*yIXdf-MY3LTO(dh&z#*Ix-(~- zneA??F$R?&hDgK^QP8Ml)hMQ@!B`B|q)U7u_+U(ZP<- z-~avh|C!Xt=8pF6c8a1p;<3mmdDGr~t&cn-2X`JPFDaEsM;8_r4FCS&Ui-QJVz)ub3sotSVrE)kYyal=W`T4CBH8(d`E|)jOR;Gz~i#s|pM%{IKDML1G zR_s29qE>WzcMJ8>{#z)j^^BgLa3_)p1!5xrG(3p{CBq_Uidw(1WC1vZTzV2^byH=| z9{rS|bxmc)*CqL+6-GHdHfy7?*^xAyor1E)Y}`PvFDZn;KrWz5M&5LklFC$h6|(j| za|~UDxKk=K=qaQpk|{cjZA1?Q1Qzl<bRsWhS5~vxY23iMm->xL_6sj3vr{!!37(l=rl2N zwdakcglz;|Y^O2KH!_uKm`saOK%)D`byLGdXUzoyC<0uhG9+sf%S)^nO7kIwmz7{> zt+(K7&?MIM%*;Qa0%IkEs3KRgn>Q))(r4?yR{j+|> z5vb7?bBK`sN4je;2WQ+Ou+dR0#Qh)r^npk|}yKn9}hkxI@=A)$(hUF{&*(%?EWKY}seP17= zUw+-cnAm;eZ{=uZZ_iiH`qX_^54w5z?H#4UI|D6!udVHB?VQ?h`wQ&PU0)Ute0y$7 zT3FSyuYFhVCx_4n-*(CKv>B-GqzpQwyZQa6wJ2K-hGEZ;) lad~)8Dw~66UX49;vQzk&AMQEX{i`>xy$Nvt+M2=z zo&H=?dj}idMPSwMO#r#6%E3dmhYd;(VAbz+2uSy24Fgua{wKi&{prC!q-pT zJ^qH7K^H)xe)ZxD?C%b6X0?N*;v!nDmMWD>ClQw4l6HT0@MCkJMF0+Ux%K|a>7E0m zTT9x{-^2BK8HGXt((vl)Gc}&C`|dp&o3C;r#PD(f{Vzl0amsgsg510`cIob-X?VR} zSEiA};Xl3Lif;7idaYJ7LUhqFqJRv22uLIJ$9$K@P0I8C_3`1sCY}l-aH0SRoG1VS zCklYTi2@*Sq5#Mkw#Vq162QenkSPINJOr5%z~wDcrUY;~NzRM_uI~{tBY^9Bgvmi`H#M1ZzZ1CYB;JL(Hd;vCi@(|Em zV%EL@8$5als2(9JUw{oBJp^2jPy%0o4Ga$feIqo@7hnU!LqHQCi7&tgmWP106O?qC nFTe(thkznLQeS`#EDyn7k&nABJvR+c00000NkvXXu0mjf7HD(_ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Janitorial/advmop.rsi/inhand-right.png b/Resources/Textures/Objects/Specific/Janitorial/advmop.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..a980da34c2bd34e81ebdff5b870d16cc9cdc3002 GIT binary patch literal 829 zcmV-D1H$}?P)5w5)6o-a5+~U+~KoCW7EDq26Uhl%ST<+d`cRBCny&r^E za(C(X{oc#n<-YGc495z9;aCAM94i2ZV+Fu)tN<8}6(D;+9S3Y1cM8ZUvhhg?cyN84 z;gUQ4T4(!*o4J#q5}%X+`q28}BesvtT&@6>_@o5nefbjC(^!$)-V`u_V=PU0VpUQFF3Qb7C4C)9U4&~f$&ejXUQt9PXXIN|$D z7qIe-q4%bMN{wkb`#y9vpgjD1&JZr3)@JB53OZf;r!l!F=(%}#c?GwJ3;6c=WYq22 zKMg+*Kd%6%1kl;CcwrG6y;Z(sxV1TeuVU{j@apzE_WSP-_*aEf0xmxM0_-i~?c*|g z@*Q&r<#ptEd3qEq{?jG^UUoBzub&MkB<4%yqQSm-*v}!1oN}$9WYtQ-nTmVmcJf4ir zW|NB;pwFd1V`%ay+2wmnJn>em#e(^A0kq-lfno3I3QeN>;(ycR2DjO#!Y~{w0ES}) zz;LVp7>*SH!?6NncGmUrcof0{^4=Suim-sZ_XemU^%ant3Cx~0V1{cw3ua| zLb4x2F}3$pm~o#%A^~x=_rzq-r;z;Ta767rF&XqJBo+`=dsijPK84gCh=kSNRmrkX zA+dm{+Pli