From bcd7085a3e1843b2ae96bf2a71bd6a201ee840a0 Mon Sep 17 00:00:00 2001 From: Alzore <140123969+Blackern5000@users.noreply.github.com> Date: Sun, 11 Aug 2024 20:49:09 -0500 Subject: [PATCH] Add diamond mining drills, buff regular mining drills (#30814) * why do I have to change so much just to add drills * diamon --- .../Locale/en-US/research/technologies.ftl | 2 +- .../Entities/Objects/Materials/materials.yml | 8 +- .../Entities/Objects/Weapons/Melee/mining.yml | 88 ++++++++++++++++++ .../Objects/Weapons/Melee/pickaxe.yml | 64 ------------- .../Entities/Structures/Machines/lathe.yml | 3 +- .../Reagents/Materials/materials.yml | 10 +- .../Prototypes/Recipes/Lathes/salvage.yml | 20 ++++ Resources/Prototypes/Recipes/Lathes/tools.yml | 9 -- Resources/Prototypes/Research/industrial.yml | 29 +++--- .../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 +++++ 13 files changed, 161 insertions(+), 94 deletions(-) delete mode 100644 Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml 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/en-US/research/technologies.ftl b/Resources/Locale/en-US/research/technologies.ftl index 70ca8d018a..4fbb0e1bd3 100644 --- a/Resources/Locale/en-US/research/technologies.ftl +++ b/Resources/Locale/en-US/research/technologies.ftl @@ -20,6 +20,7 @@ research-technology-super-powercells = Super Powercells research-technology-bluespace-storage = Bluespace Storage research-technology-portable-fission = Portable Fission research-technology-space-scanning = Space Scanning +research-technology-excavation = Mass Excavation research-technology-salvage-weapons = Salvage Weapons research-technology-draconic-munitions = Draconic Munitions @@ -43,7 +44,6 @@ research-technology-alternative-research = Alternative Research research-technology-magnets-tech = Localized Magnetism research-technology-advanced-parts = Advanced Parts research-technology-anomaly-harnessing = Anomaly Core Harnessing -research-technology-grappling = Grappling research-technology-abnormal-artifact-manipulation = Artifact Recycling research-technology-gravity-manipulation = Gravity Manipulation research-technology-quantum-leaping = Quantum Leaping diff --git a/Resources/Prototypes/Entities/Objects/Materials/materials.yml b/Resources/Prototypes/Entities/Objects/Materials/materials.yml index e8d4094400..e00f3e65d3 100644 --- a/Resources/Prototypes/Entities/Objects/Materials/materials.yml +++ b/Resources/Prototypes/Entities/Objects/Materials/materials.yml @@ -360,10 +360,6 @@ layers: - state: diamond map: ["base"] - - type: StaticPrice - price: 0 - - type: StackPrice - price: 500 - type: Appearance - type: Item heldPrefix: diamond @@ -375,6 +371,10 @@ reagents: - ReagentId: Carbon Quantity: 20 + - type: Material + - type: PhysicalComposition + materialComposition: + Diamond: 100 - type: entity parent: MaterialDiamond diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml index 4eec90584c..87826aa8f0 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml @@ -1,3 +1,91 @@ +- type: entity + name: pickaxe + parent: BaseItem + id: Pickaxe + description: Notched to perfection, for jamming it into rocks. + components: + - type: Tag + tags: + - Pickaxe + - type: Sprite + sprite: Objects/Weapons/Melee/pickaxe.rsi + state: pickaxe + - type: MeleeWeapon + attackRate: 0.7 + wideAnimationRotation: -135 + soundHit: + path: "/Audio/Weapons/smash.ogg" + params: + volume: -3 + damage: + groups: + Brute: 5 + - type: Wieldable + - type: IncreaseDamageOnWield + damage: + groups: + Brute: 10 + types: + Structural: 30 + - type: Item + size: Normal + shape: + - 0,0,2,0 + - 1,1,1,2 + sprite: Objects/Weapons/Melee/pickaxe.rsi + storedRotation: -45 + - type: UseDelay + +- type: entity + name: mining drill + parent: BaseItem + id: MiningDrill + description: Powerful tool used to quickly drill through rocks. + components: + - type: Item + storedRotation: -90 + - type: Tag + tags: + - Pickaxe + - type: Sprite + sprite: Objects/Tools/handdrill.rsi + state: handdrill + - type: MeleeWeapon + autoAttack: true + angle: 0 + wideAnimationRotation: -90 + soundHit: + path: "/Audio/Items/drill_hit.ogg" + attackRate: 4 + damage: + groups: + Brute: 3 + types: + Structural: 15 + +- 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 + + - type: entity abstract: true parent: BaseItem diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml deleted file mode 100644 index e1c98f418b..0000000000 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml +++ /dev/null @@ -1,64 +0,0 @@ -- type: entity - name: pickaxe - parent: BaseItem - id: Pickaxe - description: Notched to perfection, for jamming it into rocks. - components: - - type: Tag - tags: - - Pickaxe - - type: Sprite - sprite: Objects/Weapons/Melee/pickaxe.rsi - state: pickaxe - - type: MeleeWeapon - attackRate: 0.7 - wideAnimationRotation: -135 - soundHit: - path: "/Audio/Weapons/smash.ogg" - params: - volume: -3 - damage: - groups: - Brute: 5 - - type: Wieldable - - type: IncreaseDamageOnWield - damage: - groups: - Brute: 10 - types: - Structural: 30 - - type: Item - size: Normal - shape: - - 0,0,2,0 - - 1,1,1,2 - sprite: Objects/Weapons/Melee/pickaxe.rsi - storedRotation: -45 - - type: UseDelay - -- type: entity - name: mining drill - parent: BaseItem - id: MiningDrill - description: Powerful tool used to quickly drill through rocks. - components: - - type: Item - storedRotation: -90 - - type: Tag - tags: - - Pickaxe - - type: Sprite - sprite: Objects/Tools/handdrill.rsi - state: handdrill - - type: MeleeWeapon - autoAttack: true - angle: 0 - wideAnimationRotation: -90 - soundHit: - path: "/Audio/Items/drill_hit.ogg" - attackRate: 3.5 - damage: - groups: - Brute: 3 - types: - Structural: 12 diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 38d287cce1..8f6fb16f04 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -16,7 +16,7 @@ mask: - MachineMask layer: - - MachineLayer + - MachineLayer - type: Lathe - type: MaterialStorage - type: Destructible @@ -277,6 +277,7 @@ dynamicRecipes: - PowerDrill - MiningDrill + - MiningDrillDiamond - AnomalyScanner - AnomalyLocator - AnomalyLocatorWide diff --git a/Resources/Prototypes/Reagents/Materials/materials.yml b/Resources/Prototypes/Reagents/Materials/materials.yml index 9446b9d27f..829ae46b93 100644 --- a/Resources/Prototypes/Reagents/Materials/materials.yml +++ b/Resources/Prototypes/Reagents/Materials/materials.yml @@ -123,4 +123,12 @@ unit: materials-unit-piece icon: { sprite: Objects/Misc/reagent_fillings.rsi, state: powderpile } color: "#A9A9A9" - price: 0 \ No newline at end of file + price: 0 + +- type: material + id: Diamond + name: materials-diamond + unit: materials-unit-piece + icon: { sprite: Objects/Materials/materials.rsi, state: diamond } + color: "#80ffff" + price: 20 # big diamond gaslit us so hard diamonds actually became extremely rare diff --git a/Resources/Prototypes/Recipes/Lathes/salvage.yml b/Resources/Prototypes/Recipes/Lathes/salvage.yml index 9b3cb08643..84047ae75d 100644 --- a/Resources/Prototypes/Recipes/Lathes/salvage.yml +++ b/Resources/Prototypes/Recipes/Lathes/salvage.yml @@ -14,3 +14,23 @@ Steel: 1000 Glass: 500 # If they get spammed make it cost silver. + +- type: latheRecipe + id: MiningDrill + result: MiningDrill + category: Tools + completetime: 3 + materials: + Steel: 500 + Plastic: 100 + +- type: latheRecipe + id: MiningDrillDiamond + result: MiningDrillDiamond + category: Tools + completetime: 3 + materials: + Steel: 600 + Plastic: 200 + Silver: 200 + Diamond: 100 diff --git a/Resources/Prototypes/Recipes/Lathes/tools.yml b/Resources/Prototypes/Recipes/Lathes/tools.yml index 67d412b571..3f5003d909 100644 --- a/Resources/Prototypes/Recipes/Lathes/tools.yml +++ b/Resources/Prototypes/Recipes/Lathes/tools.yml @@ -197,15 +197,6 @@ Glass: 50 Plastic: 50 -- type: latheRecipe - id: MiningDrill - result: MiningDrill - category: Tools - completetime: 3 - materials: - Steel: 500 - Plastic: 100 - - type: latheRecipe id: WelderExperimental result: WelderExperimental diff --git a/Resources/Prototypes/Research/industrial.yml b/Resources/Prototypes/Research/industrial.yml index 4dc60314c4..373333ad43 100644 --- a/Resources/Prototypes/Research/industrial.yml +++ b/Resources/Prototypes/Research/industrial.yml @@ -11,9 +11,10 @@ cost: 7500 recipeUnlocks: - MiningDrill + - WeaponGrapplingGun - BorgModuleMining + - BorgModuleGrapplingGun - OreProcessorIndustrialMachineCircuitboard - - OreBagOfHolding - ClothingMaskWeldingGas - type: technology @@ -106,19 +107,6 @@ - RipleyPeripheralsElectronics - MechEquipmentGrabber -- type: technology - id: Grappling - name: research-technology-grappling - icon: - sprite: Objects/Weapons/Guns/Launchers/grappling_gun.rsi - state: base - discipline: Industrial - tier: 1 - cost: 5000 - recipeUnlocks: - - WeaponGrapplingGun - - BorgModuleGrapplingGun - # Tier 2 - type: technology @@ -180,6 +168,19 @@ - BorgModuleAdvancedTool - BorgModuleRCD +- type: technology + id: MassExcavation + name: research-technology-excavation + icon: + sprite: Objects/Tools/handdrilldiamond.rsi + state: handdrill + discipline: Industrial + tier: 2 + cost: 12500 + recipeUnlocks: + - OreBagOfHolding + - MiningDrillDiamond + # Tier 3 - type: technology 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