From e792440c1907a230b4b3b2afef62a55b43844de6 Mon Sep 17 00:00:00 2001 From: Ed <96445749+TheShuEd@users.noreply.github.com> Date: Wed, 30 Apr 2025 22:14:13 +0300 Subject: [PATCH] Gob hairs (#1250) * renorma * gobhairs --- .../en-US/_CP14/markings/goblin-hair.ftl | 3 -- .../ru-RU/_CP14/markings/goblin-hair.ftl | 3 -- .../Customization/Markings/goblin_hairs.yml | 26 ------------------ .../_CP14/Entities/Mobs/Species/goblin.yml | 18 ++++++++++++ .../Crafting/Graphs/improvised/gauze.yml | 2 +- .../Graphs/improvised/herbal_bandage.yml | 6 ++-- Resources/Prototypes/_CP14/Species/goblin.yml | 7 ++++- .../Customization/goblin_hair.rsi/antenna.png | Bin 892 -> 0 bytes .../goblin_hair.rsi/bedheadv2.png | Bin 703 -> 0 bytes .../goblin_hair.rsi/doublebun.png | Bin 902 -> 0 bytes .../Customization/goblin_hair.rsi/meta.json | 23 ---------------- .../Species/Goblin/displacement.rsi/hair.png | Bin 0 -> 275 bytes .../Species/Goblin/displacement.rsi/meta.json | 4 +++ .../Goblin/displacement48.rsi/hair.png | Bin 0 -> 411 bytes .../Goblin/displacement48.rsi/meta.json | 4 +++ 15 files changed, 35 insertions(+), 61 deletions(-) delete mode 100644 Resources/Locale/en-US/_CP14/markings/goblin-hair.ftl delete mode 100644 Resources/Locale/ru-RU/_CP14/markings/goblin-hair.ftl delete mode 100644 Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/goblin_hairs.yml delete mode 100644 Resources/Textures/_CP14/Mobs/Customization/goblin_hair.rsi/antenna.png delete mode 100644 Resources/Textures/_CP14/Mobs/Customization/goblin_hair.rsi/bedheadv2.png delete mode 100644 Resources/Textures/_CP14/Mobs/Customization/goblin_hair.rsi/doublebun.png delete mode 100644 Resources/Textures/_CP14/Mobs/Customization/goblin_hair.rsi/meta.json create mode 100644 Resources/Textures/_CP14/Mobs/Species/Goblin/displacement.rsi/hair.png create mode 100644 Resources/Textures/_CP14/Mobs/Species/Goblin/displacement48.rsi/hair.png diff --git a/Resources/Locale/en-US/_CP14/markings/goblin-hair.ftl b/Resources/Locale/en-US/_CP14/markings/goblin-hair.ftl deleted file mode 100644 index 3d61300da5..0000000000 --- a/Resources/Locale/en-US/_CP14/markings/goblin-hair.ftl +++ /dev/null @@ -1,3 +0,0 @@ -marking-CP14GoblinHairAntenna = Unruly Strands -marking-CP14GoblinHairBedHead2 = Bedhead 2 -marking-CP14GoblinHairDoubleBun = Double Bun \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_CP14/markings/goblin-hair.ftl b/Resources/Locale/ru-RU/_CP14/markings/goblin-hair.ftl deleted file mode 100644 index 4fe3574bda..0000000000 --- a/Resources/Locale/ru-RU/_CP14/markings/goblin-hair.ftl +++ /dev/null @@ -1,3 +0,0 @@ -marking-CP14GoblinHairAntenna = Непослушные пряди -marking-CP14GoblinHairBedHead2 = С бодуна 2 -marking-CP14GoblinHairDoubleBun = Два пунпона \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/goblin_hairs.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/goblin_hairs.yml deleted file mode 100644 index db13523cd1..0000000000 --- a/Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/goblin_hairs.yml +++ /dev/null @@ -1,26 +0,0 @@ -- type: marking - id: CP14GoblinHairAntenna - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [ CP14Goblin ] - sprites: - - sprite: _CP14/Mobs/Customization/goblin_hair.rsi - state: antenna - -- type: marking - id: CP14GoblinHairBedHead2 - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [ CP14Goblin ] - sprites: - - sprite: _CP14/Mobs/Customization/goblin_hair.rsi - state: bedheadv2 - -- type: marking - id: CP14GoblinHairDoubleBun - bodyPart: Hair - markingCategory: Hair - speciesRestriction: [ CP14Goblin ] - sprites: - - sprite: _CP14/Mobs/Customization/goblin_hair.rsi - state: doublebun \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Species/goblin.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Species/goblin.yml index b32dc7a13b..1d8dfd73d6 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/Species/goblin.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/Species/goblin.yml @@ -58,6 +58,15 @@ visible: false - type: HumanoidAppearance species: CP14Goblin + markingsDisplacement: + Hair: + sizeMaps: + 32: + sprite: _CP14/Mobs/Species/Goblin/displacement.rsi + state: hair + 48: + sprite: _CP14/Mobs/Species/Goblin/displacement48.rsi + state: hair - type: Hunger starvationDamage: types: @@ -188,6 +197,15 @@ components: - type: HumanoidAppearance species: CP14Goblin + markingsDisplacement: + Hair: + sizeMaps: + 32: + sprite: _CP14/Mobs/Species/Goblin/displacement.rsi + state: hair + 48: + sprite: _CP14/Mobs/Species/Goblin/displacement48.rsi + state: hair - type: Inventory templateId: CP14Human speciesId: goblin diff --git a/Resources/Prototypes/_CP14/Recipes/Crafting/Graphs/improvised/gauze.yml b/Resources/Prototypes/_CP14/Recipes/Crafting/Graphs/improvised/gauze.yml index 6783405962..02851e5934 100644 --- a/Resources/Prototypes/_CP14/Recipes/Crafting/Graphs/improvised/gauze.yml +++ b/Resources/Prototypes/_CP14/Recipes/Crafting/Graphs/improvised/gauze.yml @@ -8,7 +8,7 @@ steps: - material: CP14Cloth amount: 2 - doAfter: 4 + doAfter: 3 - node: cp14gauze entity: CP14Gauze1 diff --git a/Resources/Prototypes/_CP14/Recipes/Crafting/Graphs/improvised/herbal_bandage.yml b/Resources/Prototypes/_CP14/Recipes/Crafting/Graphs/improvised/herbal_bandage.yml index 34326ba336..7085611514 100644 --- a/Resources/Prototypes/_CP14/Recipes/Crafting/Graphs/improvised/herbal_bandage.yml +++ b/Resources/Prototypes/_CP14/Recipes/Crafting/Graphs/improvised/herbal_bandage.yml @@ -7,10 +7,8 @@ - to: cp14herbbandage steps: - material: CP14FloraMaterial - amount: 2 - - material: CP14FloraMaterial - amount: 2 - doAfter: 4 + amount: 3 + doAfter: 3 - node: cp14herbbandage entity: CP14HerbalBandage1 diff --git a/Resources/Prototypes/_CP14/Species/goblin.yml b/Resources/Prototypes/_CP14/Species/goblin.yml index cfdc5702a9..65f3dad79c 100644 --- a/Resources/Prototypes/_CP14/Species/goblin.yml +++ b/Resources/Prototypes/_CP14/Species/goblin.yml @@ -33,7 +33,6 @@ - type: markingPoints id: CP14MobGoblinMarkingLimits - onlyWhitelisted: true points: Hair: points: 1 @@ -41,23 +40,29 @@ FacialHair: points: 1 required: false + onlyWhitelisted: true Snout: points: 1 required: true defaultMarkings: [ CP14GoblinNose ] + onlyWhitelisted: true HeadTop: points: 1 required: true defaultMarkings: [ CP14GoblinEars ] + onlyWhitelisted: true Chest: points: 1 required: false + onlyWhitelisted: true Legs: points: 2 required: false + onlyWhitelisted: true Arms: points: 2 required: false + onlyWhitelisted: true - type: humanoidBaseSprite id: CP14MobGoblinEyes diff --git a/Resources/Textures/_CP14/Mobs/Customization/goblin_hair.rsi/antenna.png b/Resources/Textures/_CP14/Mobs/Customization/goblin_hair.rsi/antenna.png deleted file mode 100644 index 43da1e53f187ecbfd42ec03c9b405b57b6d81edb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 892 zcmV-?1B3jDP)Px&Hc3Q5RCt{2+%b;hAQT4RKdUWWTSDRh=~DRsQ~LlpqYsdp1Gq|;10W$$(|e2P zc?q#+GBe=8qyK9%airt{4~$3R0YpSZL_|bH^bH||>2|wK>Gj*~HiZzT5W>@EHIW#X z+E9J`anQz?xe;k&j4@R#$1j;@DAF>i^QQYzI-?=vsT!L1}QWUFs z_eMlSL_|bHL_|bHL_|bHL_|bHL_|bHR8m^{Wvv)e4br+ma_y($$wnHrm&V9h=PjyZ z6+Q7G4Uy_1as8m&g^zNOc;#?jTv(*k>CR$@^oC)Wx~_v#YOWs?H>kD~^>MPCPA7Qp zp|yrm3SHMN9$Ctv$N&t(F!g;uR~eBSK{5z6W2Hx}dUEUTR0~WvKW;?V4)?rQ(88k~F2`FR}zlQKq=|+TJuxbBN=Q+mlm~ z0f^Vmy`L_R9G_Wd6*#!RwZE_pNFtXfL#yP(uo@fIC`y>V5;VBV2DmHC5+-D186v)BWc_OTl{G?-TBB?bg;xvAiA!h!GK z`r?EW#!n`=aoKYMjRe{t?4&ViO0k~py#LFOJ1^bdl+AqpNksLzop;`U*PDMem-*fI z-@DzORqE|swqmM))5`9-#d?Nrp8atuC#&!8`M2;Z^HTSPmrZilC-+p<)?Tga(wpu* z{rtamQPpcBt8yHA0=KFs_r%4;&AM{GMDUyYRdViW zuHOIC=}PjeInquXOZ|3z-?wB+%G#+V=Y$Q;7f)2lUi<26@KwexL#?GtUVp9H2NK;}=<4MnqZ>n$h>R*dm`})_*-$7nd$2Xo9zg2GWobCCY z2|<@ke0SZ=doQ*>>U!w()2SJyyr#Dqp5OU!HG8Sq?N^(lcg3xDj{PuYQc{o9@xtob zZIge$p8IwQ6F8XA3HyhV#m!aiCVyAVDgJmbKhiNhFDw4>zGw4x{eAOq^O*%{<;rk_&fzbj?l?l5LEeS4L6;uhWuZ_9$c zR-Qg!a=)Q+-f4@zXrr*6z+*G&@0GW`TyMAPsKjR8-mPJeE%G{}bW1(YOuDydZ`P?R zH`V`Zv;_3odh{PyHf^S3tXS&&yV0Q3yaSW-L z^Y)H?)?)_|wh!k|Pg}{#Y~^6(tiT?SZm=$vTmHb(a|?o(%wuM`bC#Fo)iVYo<&f3$ zb<{jaU2eqP1HQ1J54u5}x4zhy{xRrBBy$IW|h%T~Oul4?=qP+X83eWkSb z@I!;rT~{>fKieFCSl|$QJ>z!RQr`XbH7pFj|JJd_Op~4YQ;}uQzI{wP&aB&(yD@G( zBSUKBB8{%8$99@}=w7=u!*5Q#;jsler&pe}Uuwj#a?9uW^X8?wMrA*)+I!4^=hpJj z&-){FPft;EzNoV)1pGqwaI;TzitA!O=B$7Y;`)B97Dmp;6AyFcsXXmY-n{0Hy za!p88Z2=0TeQzj<&i=_bh5fmx3`uUEnecIo+gR=Q03QFOX^#l9uepS_64 ze*Ch;>9R@15yuVJjxEb9u$sHb>*USGIM>+7wnpPMcva7%JzhRj;DX~`Sbm9DR(j~g=0 zm^NpN@2z)Yp#{2!(mLNouKp!DVN$$66l3}KDd+w~2kmG2wQqjxChw@MecAi(pWoE{ zYhSp1`!5EW{^L_cew~=Bzl68;{^JT8yR_rly$xy`M;-Vw-!xUE3Y~_xX5Z&%j^y!dod_dK5p38m_+MY9dou!AXZ|uA|9(^aVzbX6uI^GeBV+=OU{#Ul^uGtUW@0a5bhWThiohh-C^ZuthiH|A|>Z~2hTIp w{zW?(&pBJn*n;p?nb~<;c07J;P`MzkD9QhE>dKxfU}!UVy85}Sb4q9e09j3ymjD0& literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Mobs/Species/Goblin/displacement48.rsi/meta.json b/Resources/Textures/_CP14/Mobs/Species/Goblin/displacement48.rsi/meta.json index 37a039174a..66a64ab75e 100644 --- a/Resources/Textures/_CP14/Mobs/Species/Goblin/displacement48.rsi/meta.json +++ b/Resources/Textures/_CP14/Mobs/Species/Goblin/displacement48.rsi/meta.json @@ -13,6 +13,10 @@ { "name": "head", "directions": 4 + }, + { + "name": "hair", + "directions": 4 } ] }