Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[TWEAK] Исправления камней, инструментов утилизаторов. #72

Merged
merged 7 commits into from
Dec 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 18 additions & 3 deletions Resources/Prototypes/Damage/modifier_sets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,14 +40,29 @@
- type: damageModifierSet
id: Rock
coefficients:
Structural: 4
Structural: 5
Blunt: 0.5
Slash: 0.25
Piercing: 0.75
Heat: 0.9
Piercing: 0.5
Heat: 0.75
flatReductions:
Blunt: 5

- type: damageModifierSet
id: RockStrong
coefficients:
Structural: 5
Blunt: 0.25
Slash: 0.1
Piercing: 0.25
Heat: 0.5
flatReductions:
Blunt: 10
Slash: 10
Piercing: 10
Heat: 10
Structural: 10

- type: damageModifierSet
id: PerforatedMetallic
coefficients:
Expand Down
39 changes: 18 additions & 21 deletions Resources/Prototypes/DeltaV/Entities/Structures/Walls/mountain.yml
Original file line number Diff line number Diff line change
@@ -1,25 +1,31 @@
# WD edit. Changed behavior to getting Structural damage, so it's now StructuralInorganic
# Was Inorganic and gatherable by pickaxe (removed).
# OreChance increased from 0.33 to 0.5 and from 0.2 to 0.25

- type: entity
id: AsteroidAltRock #It's 1994
id: AsteroidAltRock #It was 1994. Now it's 2024.
parent: BaseStructure
name: asteroid rock
suffix: Low Ore Yield
description: A rocky asteroid.
components:
# WD EDIT START
- type: Gatherable
toolWhitelist:
tags:
- Pickaxe
# WD EDIT END
- type: Sprite
sprite: DeltaV/Structures/Walls/asteroid_rock.rsi
state: full
- type: Damageable
damageContainer: Inorganic
damageModifierSet: Metallic
damageContainer: StructuralInorganic
damageModifierSet: RockStrong
- type: Destructible
thresholds:
- trigger:
!type:DamageTrigger
damage: 150
damage: 100
behaviors:
- !type:DoActsBehavior
acts: ["Destruction"]
Expand All @@ -40,7 +46,7 @@
key: walls
base: rock_
- type: OreVein
oreChance: 0.2
oreChance: 0.25
oreRarityPrototypeId: RandomOreDistributionStandard

- type: entity
Expand All @@ -57,35 +63,24 @@
thresholds:
- trigger:
!type:DamageTrigger
damage: 300
damage: 200
behaviors:
- !type:DoActsBehavior
acts: ["Destruction"]
- type: OreVein
oreChance: 0.20
oreChance: 0.25
oreRarityPrototypeId: RandomOreDistributionHigh

- type: entity
id: MountainRock
parent: BaseStructure
name: mountain rock
suffix: Un-mineable
suffix: Un-destructible
description: A craggy mountain wall. It is too hard to mine.
components:
- type: Sprite
sprite: DeltaV/Structures/Walls/mountain_rock.rsi
state: full
- type: Damageable
damageContainer: Inorganic
damageModifierSet: StrongMetallic
- type: Destructible
thresholds:
- trigger:
!type:DamageTrigger
damage: 1500
behaviors:
- !type:DoActsBehavior
acts: ["Destruction"]
- type: Occluder
- type: Airtight
- type: Fixtures
Expand All @@ -110,12 +105,14 @@
suffix: Higher Ore Yield
description: A rocky asteroid.
components:
# WD EDIT START
- type: Gatherable
toolWhitelist:
tags:
- Pickaxe
#WD EDIT END
- type: OreVein
oreChance: 0.33
oreChance: 0.5
oreRarityPrototypeId: RandomOreDistributionStandard

- type: entity
Expand All @@ -126,5 +123,5 @@
description: A rocky asteroid.
components:
- type: OreVein
oreChance: 0.33
oreChance: 0.5
oreRarityPrototypeId: OreCrab
Original file line number Diff line number Diff line change
Expand Up @@ -413,10 +413,10 @@
damage:
types:
Blunt: 25
Structural: 30
Structural: 20
# Short lifespan
- type: TimedDespawn
lifetime: 0.4
lifetime: 0.2 # WD EDIT / Actually short bullet, ~4 tiles.

- type: entity
id: BulletKineticShuttle
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
capacity: 1
count: 1
- type: MeleeWeapon
attackRate: 0.75
attackRate: 0.5
range: 1.75
wideAnimationRotation: -135
damage:
Expand All @@ -63,7 +63,7 @@
types:
Blunt: 2.5
Slash: 2.5
Structural: 30
Structural: 20
- type: GunRequiresWield
- type: Item
size: Ginormous
Expand Down Expand Up @@ -114,8 +114,6 @@
components:
- type: Sprite
sprite: Objects/Weapons/Melee/crusher_glaive.rsi
- type: UseDelay
delay: 1.9
- type: LeechOnMarker
leech:
groups:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
damage:
types:
Blunt: 5
Structural: 30
Structural: 20
- type: Item
size: Normal
shape:
Expand Down
8 changes: 5 additions & 3 deletions Resources/Prototypes/Entities/Structures/Walls/asteroid.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
thresholds:
- trigger:
!type:DamageTrigger
damage: 120
damage: 100
behaviors:
- !type:DoActsBehavior
acts: ["Destruction"]
Expand Down Expand Up @@ -418,13 +418,15 @@
- type: Transform
noRot: true
- type: SoundOnGather
# WD EDIT START
- type: Gatherable
toolWhitelist:
tags:
- Pickaxe
# WD EDIT END
- type: Damageable
damageContainer: Inorganic
damageModifierSet: Metallic
damageContainer: StructuralInorganic
damageModifierSet: RockStrong
- type: Destructible
thresholds:
- trigger:
Expand Down
Loading