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

Нерф дракона #609

Merged
merged 1 commit into from
Nov 13, 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
4 changes: 2 additions & 2 deletions Content.Server/Dragon/Components/DragonRiftComponent.cs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public sealed partial class DragonRiftComponent : SharedDragonRiftComponent
/// <summary>
/// The maximum amount we can accumulate before becoming impervious.
/// </summary>
[ViewVariables(VVAccess.ReadWrite), DataField("maxAccumuluator")] public float MaxAccumulator = 200f;
[ViewVariables(VVAccess.ReadWrite), DataField("maxAccumuluator")] public float MaxAccumulator = 300f;

/// <summary>
/// Accumulation of the spawn timer.
Expand All @@ -33,7 +33,7 @@ public sealed partial class DragonRiftComponent : SharedDragonRiftComponent
/// How long it takes for a new spawn to be added.
/// </summary>
[ViewVariables(VVAccess.ReadWrite), DataField("spawnCooldown")]
public float SpawnCooldown = 20f;
public float SpawnCooldown = 30f;

[ViewVariables(VVAccess.ReadWrite), DataField("spawn", customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]
public string SpawnPrototype = "MobCarpDragon";
Expand Down
6 changes: 4 additions & 2 deletions Resources/Prototypes/Entities/Mobs/Player/dragon.yml
Original file line number Diff line number Diff line change
Expand Up @@ -133,8 +133,8 @@
path: /Audio/Weapons/Xeno/alien_claw_flesh3.ogg
damage:
types:
Piercing: 25 #Sunrise-edit
Slash: 25 #Sunrise-edit
Piercing: 15
Slash: 15
- type: Devourer
foodPreference: Humanoid
shouldStoreDevoured: true
Expand Down Expand Up @@ -165,6 +165,8 @@
- type: Damageable
damageContainer: Biological
damageModifierSet: Dragon
- type: TTS
voice: HearthstoneLordOfThunder
# Sunrise-End

- type: entity
Expand Down
24 changes: 16 additions & 8 deletions Resources/Prototypes/Entities/Structures/Specific/dragon.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,20 @@
anchored: true
- type: Physics
bodyType: Static
canCollide: false
canCollide: true #Sunrise-edit
- type: Fixtures
#Sunrise-start
fixtures:
fix1:
shape:
!type:PhysShapeAabb
bounds: "-0.25,-0.48,0.25,0.48"
density: 75
mask:
- MachineMask
layer:
- MachineLayer
#Sunrise-end
- type: Sprite
layers:
- sprite: Structures/Specific/carp_rift.rsi
Expand All @@ -32,8 +44,8 @@
# only show after making the announcement at 50%
enabled: false
- type: Damageable
damageContainer: Inorganic
damageModifierSet: Metallic
damageContainer: Rift #Sunrise-edit
damageModifierSet: Rift #Sunrise-edit
- type: Destructible
thresholds:
- trigger:
Expand All @@ -46,9 +58,5 @@
sound:
path: /Audio/Weapons/Guns/Gunshots/rocket_launcher.ogg
#Sunrise-start
- type: Armor
modifiers:
coefficients:
Blunt: 0.70
Slash: 0.70
- type: DamageOverlay
#Sunrise-end
5 changes: 5 additions & 0 deletions Resources/Prototypes/_Sunrise/Damage/containers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,8 @@
- Heat
- Shock
- Caustic

- type: damageContainer
id: Rift
supportedGroups:
- Brute
9 changes: 8 additions & 1 deletion Resources/Prototypes/_Sunrise/Damage/modifier_sets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,11 @@
Blunt: 0.8
Slash: 0.8
Piercing: 0.8
Heat: 0.3
Heat: 0.6

- type: damageModifierSet
id: Rift
coefficients:
Blunt: 0.6
Slash: 0.6
Piercing: 0.6
Loading