From 2fe053b5a21cce814c9235ce2a912c23e4c8d03d Mon Sep 17 00:00:00 2001 From: keslik Date: Wed, 5 Mar 2025 23:06:09 +0300 Subject: [PATCH] diamond drill --- .../entities/objects/tools/blueprint.ftl | 4 ++-- .../entities/objects/weapons/melee/mining.ftl | 2 ++ .../Entities/Objects/Tools/blueprint.yml | 8 +++---- .../Objects/Weapons/Melee/pickaxe.yml | 22 ++++++++++++++++++ .../Prototypes/Recipes/Lathes/salvage.yml | 12 +++++----- .../Tools/handdrilldiamond.rsi/handdrill.png | Bin 0 -> 416 bytes .../handdrilldiamond.rsi/inhand-left.png | Bin 0 -> 392 bytes .../handdrilldiamond.rsi/inhand-right.png | Bin 0 -> 392 bytes .../Tools/handdrilldiamond.rsi/meta.json | 22 ++++++++++++++++++ 9 files changed, 58 insertions(+), 12 deletions(-) create mode 100644 Resources/Textures/Objects/Tools/handdrilldiamond.rsi/handdrill.png create mode 100644 Resources/Textures/Objects/Tools/handdrilldiamond.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Tools/handdrilldiamond.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Tools/handdrilldiamond.rsi/meta.json diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/tools/blueprint.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/tools/blueprint.ftl index 4e07a6758b..b155697cef 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/tools/blueprint.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/tools/blueprint.ftl @@ -2,7 +2,7 @@ ent-BaseBlueprint = чертёж .desc = Чертёж какого-то устройства. Его можно поместить в автолат. ent-BlueprintFulton = чертёж фултона .desc = Чертёж со схемой фултона. Его можно поместить в автолат. -ent-BlueprintSeismicCharge = чертёж сейсмического заряда - .desc = Чертеж со схемой сейсмического заряда. Его можно поместить в автолат. +ent-BlueprintMiningDrillDiamond = чертёж алмазного шахтёрского бура + .desc = Чертеж со схемой алмазного бура. Его можно поместить в автолат. ent-BlueprintSoapOmega = чертёж омега мыла .desc = Чертеж со схемой омега мыла. Его можно поместить в автолат. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/melee/mining.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/melee/mining.ftl index 33e699a9fc..9867b945fd 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/melee/mining.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/melee/mining.ftl @@ -10,3 +10,5 @@ ent-Pickaxe = кирка .desc = Зазубренная до совершенства, чтобы вбивать её в камни. ent-MiningDrill = шахтёрский бур .desc = Мощный инструмент, служащий для быстрого бурения горных пород. +ent-MiningDrillDiamond = шахтёрский бур с алмазным сверлом + .desc = Более эффективная версия шахтёрского бура. diff --git a/Resources/Prototypes/Entities/Objects/Tools/blueprint.yml b/Resources/Prototypes/Entities/Objects/Tools/blueprint.yml index 43cbdc2431..18a52f29ee 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/blueprint.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/blueprint.yml @@ -30,10 +30,10 @@ - type: entity parent: BaseBlueprint - id: BlueprintSeismicCharge - name: seismic charge blueprint - description: A blueprint with a schematic of a seismic charge. It can be inserted into an autolathe. + id: BlueprintMiningDrillDiamond # WD start + name: diamond mining drill blueprint + description: A blueprint with a schematic of a diamond mining drill. It can be inserted into an autolathe. components: - type: Blueprint providedRecipes: - - SeismicCharge + - MiningDrillDiamond # WD end diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml index fa961dca56..8806ba6f89 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml @@ -64,3 +64,25 @@ Brute: 3 types: Structural: 12 + +- type: entity + name: diamond tipped mining drill + parent: MiningDrill + id: MiningDrillDiamond + description: A significantly more efficient mining drill tipped with diamond. + components: + - type: Sprite + sprite: Objects/Tools/handdrilldiamond.rsi + state: handdrill + - type: MeleeWeapon + autoAttack: true + angle: 0 + wideAnimationRotation: -90 + soundHit: + path: "/Audio/Items/drill_hit.ogg" + attackRate: 4 + damage: + groups: + Brute: 6 + types: + Structural: 30 diff --git a/Resources/Prototypes/Recipes/Lathes/salvage.yml b/Resources/Prototypes/Recipes/Lathes/salvage.yml index 567793a23a..cdbfe5fb4d 100644 --- a/Resources/Prototypes/Recipes/Lathes/salvage.yml +++ b/Resources/Prototypes/Recipes/Lathes/salvage.yml @@ -18,11 +18,11 @@ # If they get spammed make it cost silver. - type: latheRecipe - id: SeismicCharge - result: SeismicCharge + id: MiningDrillDiamond # WD start + result: MiningDrillDiamond category: Tools - completetime: 5 # WD Edit from 1 to 5 + completetime: 5 materials: - Plastic: 1500 - Steel: 100 - Silver: 100 + Steel: 1500 + Plastic: 1000 + Silver: 200 # WD end diff --git a/Resources/Textures/Objects/Tools/handdrilldiamond.rsi/handdrill.png b/Resources/Textures/Objects/Tools/handdrilldiamond.rsi/handdrill.png new file mode 100644 index 0000000000000000000000000000000000000000..8b913e2bd9bd9304ab6aa7081c8f7e3a50aa9bf2 GIT binary patch literal 416 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCikF1AIbUm1Lxhv^ApqTq@H;W6iS`v?U$i(7nfNwyA|5-0)}S}&*Fee zI14-?iy0XBj({-ZRBb+Kpx{AI7sn6_|F`Gw@--Rous)bO?clNZ5;wlrhn$}y)ykc` z=j(=^lD`UbH}n5&o~7T=-0|Sc!OsU)7Kqz+x%0Lz%v7k^|CF!d-NmxG>;g&hzwNHM zF&;LUvB32;=bogFWSQfO-X+XhHZ%4IQ;5M))xMY-4~`%&;}FZEyEge3yw*SZ)m%X5 zsgB8Ots7hsWo6}lLH`BLIGu93kPvKsyjFkpIZpu&ohQCqcIKS3yw}9M@6IB%4W)%T l^VLn;Kh3dU@l$k0EaOX4pWU<0t^oxCgQu&X%Q~loCIDjpvgQB) literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Tools/handdrilldiamond.rsi/inhand-left.png b/Resources/Textures/Objects/Tools/handdrilldiamond.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..db6873b739fc833b6287a5fb3387aa04cbac9b66 GIT binary patch literal 392 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`1E1o(uwI$4@1$w=+-n!TVc$<)HJGCedbD!Jy+p-QWUhX4Qf|NjqE_(|c& zR3ODu666>B9|0JI?w>mc6z44Ph%9Dc;5!Jyj5{V~zXb|j^>lFziEw{A?X*y{0*@;* zBjeBi|8+|)MV(ptsw6qR$ZXQbqMDo?A@xUC)LzUuz%sX*OV87B#vC2Lg{)6@N;diE z-|E@x<#5Jsm+P|Lqpp#?8jebRl7CrGZIZa@9_%S{v95F3^H0sOW^0#9rZ}uAs$I;o zy6V`0g$lLz>wj=wH*DmzQZsNo&hlOK%+^9aL!c*oFm(Di%|&kE}U zF?~KSdR*=@?#s&NSgU?w1LJOHkt^HwuPBx)XV-a=so-!oQH{ZuvAlid1D$&P6<-k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`1E1o(uwI$4@1$w--6I4)>Q+T%4lEGoG&J+#uQq2|z`hX4Qf|NjqE7~E}l z3`p^m1o;L3M*s$)`{&L9#W@Q+B8wRq_zr?FN6AQTKWM zlZl>^y%lE?u1pF0Bb;EyF~ux7?VH>_6Nj?%8@~Ls?KX{kUB;tlYaAo+=iRac!f!cN zeRC_26YNk>ViI(5`QYJr|HiwJt9c#`AA<7(WaL{}E}W=)rTz3}od<(UZb+Y~_UyxV zCpa{;9dA0b?HVWNLNTk%-~iFtij8x4+qP(ChDa+WPLPheWu?NC