From d57f9b6a482bf0d316d9f67f2db67f72f48cc166 Mon Sep 17 00:00:00 2001 From: dontbetank <59025279+dontbetank@users.noreply.github.com> Date: Wed, 21 Dec 2022 17:53:10 +0300 Subject: [PATCH] Librarian QoL (#12958) --- .../catalog/cargo/cargo-service.ftl | 3 +++ .../catalog/fills/crates/service-crates.ftl | 3 +++ .../Catalog/Cargo/cargo_service.yml | 10 ++++++++ .../Fills/Backpacks/StarterGear/backpack.yml | 10 ++++++++ .../Fills/Backpacks/StarterGear/duffelbag.yml | 10 ++++++++ .../Fills/Backpacks/StarterGear/satchel.yml | 10 ++++++++ .../Catalog/Fills/Crates/service.yml | 9 +++++++ .../VendingMachines/Inventories/games.yml | 1 + .../Entities/Objects/Misc/books.yml | 3 +++ .../Objects/Specific/Librarian/books_bag.yml | 24 ++++++++++++++++++ .../Roles/Jobs/Civilian/librarian.yml | 8 +++--- Resources/Prototypes/tags.yml | 3 +++ .../Equipment/books_bag.rsi/equipped-BELT.png | Bin 0 -> 732 bytes .../Library/Equipment/books_bag.rsi/icon.png | Bin 0 -> 683 bytes .../Library/Equipment/books_bag.rsi/meta.json | 18 +++++++++++++ 15 files changed, 109 insertions(+), 3 deletions(-) create mode 100644 Resources/Prototypes/Entities/Objects/Specific/Librarian/books_bag.yml create mode 100644 Resources/Textures/Objects/Specific/Library/Equipment/books_bag.rsi/equipped-BELT.png create mode 100644 Resources/Textures/Objects/Specific/Library/Equipment/books_bag.rsi/icon.png create mode 100644 Resources/Textures/Objects/Specific/Library/Equipment/books_bag.rsi/meta.json diff --git a/Resources/Locale/en-US/prototypes/catalog/cargo/cargo-service.ftl b/Resources/Locale/en-US/prototypes/catalog/cargo/cargo-service.ftl index 90730fee02..3657bb0a75 100644 --- a/Resources/Locale/en-US/prototypes/catalog/cargo/cargo-service.ftl +++ b/Resources/Locale/en-US/prototypes/catalog/cargo/cargo-service.ftl @@ -18,3 +18,6 @@ ent-ServiceBureaucracy = { ent-CrateServiceBureaucracy } ent-ServicePersonnel = { ent-CrateServicePersonnel } .desc = { ent-CrateServicePersonnel.desc } + +ent-ServiceBooks = { ent-CrateServiceBooks } + .desc = { ent-CrateServiceBooks.desc } diff --git a/Resources/Locale/en-US/prototypes/catalog/fills/crates/service-crates.ftl b/Resources/Locale/en-US/prototypes/catalog/fills/crates/service-crates.ftl index 247a3b9e2b..82c955a888 100644 --- a/Resources/Locale/en-US/prototypes/catalog/fills/crates/service-crates.ftl +++ b/Resources/Locale/en-US/prototypes/catalog/fills/crates/service-crates.ftl @@ -18,3 +18,6 @@ ent-CrateServiceBureaucracy = Bureaucracy crate ent-CrateServicePersonnel = Personnel crate .desc = Contains a box of blank ID cards and PDAs. + +ent-CrateServiceBooks = Books crate + .desc = Contains 10 empty books of random appearance diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_service.yml b/Resources/Prototypes/Catalog/Cargo/cargo_service.yml index e9c3d19681..c9329167f2 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_service.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_service.yml @@ -67,3 +67,13 @@ cost: 1000 category: Service group: market + +- type: cargoProduct + id: ServiceBooks + icon: + sprite: Objects/Misc/books.rsi + state: book0 + product: CrateServiceBooks + cost: 1000 + category: Service + group: market diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml index d13f55cab8..5be7adfaab 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml @@ -116,6 +116,16 @@ - id: AcousticGuitarInstrument - id: SaxophoneInstrument +- type: entity + noSpawn: true + parent: ClothingBackpack + id: ClothingBackpackLibrarianFilled + components: + - type: StorageFill + contents: + - id: BoxSurvival + - id: BookRandom + - type: entity noSpawn: true parent: ClothingBackpack diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml index 5f72fce38a..a04b9fb846 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml @@ -115,6 +115,16 @@ - id: AcousticGuitarInstrument - id: SaxophoneInstrument +- type: entity + noSpawn: true + parent: ClothingBackpackDuffel + id: ClothingBackpackDuffelLibrarianFilled + components: + - type: StorageFill + contents: + - id: BoxSurvival + - id: BookRandom + - type: entity noSpawn: true parent: ClothingBackpackDuffel diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml index 0296477938..8abb4cfa79 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml @@ -104,6 +104,16 @@ - id: AcousticGuitarInstrument - id: SaxophoneInstrument +- type: entity + noSpawn: true + parent: ClothingBackpackSatchel + id: ClothingBackpackSatchelLibrarianFilled + components: + - type: StorageFill + contents: + - id: BoxSurvival + - id: BookRandom + - type: entity noSpawn: true parent: ClothingBackpackSatchel diff --git a/Resources/Prototypes/Catalog/Fills/Crates/service.yml b/Resources/Prototypes/Catalog/Fills/Crates/service.yml index e046d51a17..1f5982cfcc 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/service.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/service.yml @@ -102,3 +102,12 @@ amount: 1 - id: BoxID amount: 1 + +- type: entity + id: CrateServiceBooks + parent: CrateGenericSteel + components: + - type: StorageFill + contents: + - id: BookRandom + amount: 10 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/games.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/games.yml index e791b4d669..059ce5f9bb 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/games.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/games.yml @@ -8,3 +8,4 @@ BackgammonBoard: 1 ParchisBoard: 1 CheckerBoard: 1 + BooksBag: 3 diff --git a/Resources/Prototypes/Entities/Objects/Misc/books.yml b/Resources/Prototypes/Entities/Objects/Misc/books.yml index a69fd75a75..fce7cf0d47 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/books.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/books.yml @@ -18,6 +18,9 @@ interfaces: - key: enum.PaperUiKey.Key type: PaperBoundUserInterface + - type: Tag + tags: + - Book - type: entity parent: BookBase diff --git a/Resources/Prototypes/Entities/Objects/Specific/Librarian/books_bag.yml b/Resources/Prototypes/Entities/Objects/Specific/Librarian/books_bag.yml new file mode 100644 index 0000000000..787c9a39e6 --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Specific/Librarian/books_bag.yml @@ -0,0 +1,24 @@ +- type: entity + name: books bag + id: BooksBag + parent: BaseStorageItem + description: A refined bag to carry your own library + components: + - type: Sprite + netsync: false + sprite: Objects/Specific/Library/Equipment/books_bag.rsi + state: icon + - type: Clothing + sprite: Objects/Specific/Library/Equipment/books_bag.rsi + quickEquip: false + slots: + - belt + - type: Item + size: 151 + - type: Storage + capacity: 150 + quickInsert: true + areaInsert: true + whitelist: + tags: + - Book diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml b/Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml index 810bbdfdf6..76592f8362 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml @@ -13,13 +13,15 @@ id: LibrarianGear equipment: jumpsuit: ClothingUniformJumpsuitLibrarian - back: ClothingBackpackFilled + back: ClothingBackpackLibrarianFilled shoes: ClothingShoesBootsLaceup id: LibrarianPDA ears: ClothingHeadsetService pocket1: d10Dice + belt: BooksBag + pocket2: HandLabeler # for making named bestsellers inhand: right hand: BriefcaseBrownFilled innerclothingskirt: ClothingUniformJumpskirtColorLightBrown - satchel: ClothingBackpackSatchelFilled - duffelbag: ClothingBackpackDuffelFilled + satchel: ClothingBackpackSatchelLibrarianFilled + duffelbag: ClothingBackpackDuffelLibrarianFilled diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml index 663f7855d9..51f3a9e571 100644 --- a/Resources/Prototypes/tags.yml +++ b/Resources/Prototypes/tags.yml @@ -24,6 +24,9 @@ - type: Tag id: BodyBag +- type: Tag + id: Book + - type: Tag id: BorgArm diff --git a/Resources/Textures/Objects/Specific/Library/Equipment/books_bag.rsi/equipped-BELT.png b/Resources/Textures/Objects/Specific/Library/Equipment/books_bag.rsi/equipped-BELT.png new file mode 100644 index 0000000000000000000000000000000000000000..a0784e730ee0a78deeae6ffafa65b1fb82837b06 GIT binary patch literal 732 zcmV<20wev2P)4Tx04UFukxM8aGZWj4PaVB6*Wk%g(VpupTtY^yDEMsfQwT1hH+fue8`Py`m zQ;OFV+u4Hkb5Hfc@S-y{sdSmGj55Xqadb=yER!Wqm#mH`9tqixRq(e2{E51VQaA=RPrm=w4z*kGwdwnxhra)H1l5ml;gtL<2Qct1`esRM z+lPjAIJ+!q<~E#fK=VV+aE(B!mZ_!F@OmQOGy{#-P(N4f?Ps6kJ4i}b<5#e|2OSy7 zp0Duky7J!sJQMUs>>Ck=a)9?^S;PPU02@$DR7K_g?=CPhe*ge!001~TJZ4cfHZLC} zCMW;^0LI~x7XSbN33O6UQ~&?}|NsC0{{T}@coF~r010qNS#tmY3ljhU3ljkVnw%H_ z006{EL_t(oN9~p|0>dB(02Pe-{}&f1gJRL7S-A;CF2qGre@O^Jz=R+K%p^!zg9BsH z7y|-oxMw^z2@+sobZse@WUqptJA~~ZGrG3qD%qOT?+%bVXpC-HT9s^VP6zb;cXt4A zv%Y)3fH&*=cy7GJzX(AHm=J`32|);$Mc}^8!kS$K2s=ZT^TXr33esL6wXT3l@z4QK z!So2v0va(69ngSMHU44*JY?(yEAt&>8Zw^M+e`E(EDs}iP6%ELdjA02h4Tx04UFukxM8aGZWj4PaVB6*Wk%g(VpupTtY^yDEMsfQwT1hH+fue8`Py`m zQ;OFV+u4Hkb5Hfc@S-y{sdSmGj55Xqadb=yER!Wqm#mH`9tqixRq(e2{E51VQaA=RPrm=w4z*kGwdwnxhra)H1l5ml;gtL<2Qct1`esRM z+lPjAIJ+!q<~E#fK=VV+aE(B!mZ_!F@OmQOGy{#-P(N4f?Ps6kJ4i}b<5#e|2OSy7 zp0Duky7J!sJQMUs>>Ck=a)9?^S;PPU01r@1R7EZ@GJgO7<^S(#0000006c7o9RL6T z1$0tQQ~&?}{{Z{84pRUC010qNS#tmY3ljhU3ljkVnw%H_005&&L_t(IPvwzO5`Z8G zL>0XMncGDu#G3y4X>$gW=R(=Wi@pUKl;hNuwhrMnqAO*hDg->bBBSrBD0mR~YFa%^ zB5+Tw;z0{QLajcdMvoH!ksMGj0Crf81-<}0!}DU(GOvKSo&viACe$d{6o8$n30NDi zc<}LPZ^_*Ze40pn?*_0%Ct%42NOh=pVN>QA%AX{$s9raTRla=zPx=Kg#sLo)3>90s RgNgtE002ovPDHLkV1lsDC&2&! literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Library/Equipment/books_bag.rsi/meta.json b/Resources/Textures/Objects/Specific/Library/Equipment/books_bag.rsi/meta.json new file mode 100644 index 0000000000..e880e01027 --- /dev/null +++ b/Resources/Textures/Objects/Specific/Library/Equipment/books_bag.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Remade from plant bag by discord user \"Red Horse#9950\"", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-BELT", + "directions": 4 + } + ] +}