Skip to content

Commit

Permalink
Merge pull request #246 from space-sunrise/casual
Browse files Browse the repository at this point in the history
Оказуаливание геймплея
  • Loading branch information
VigersRay authored Dec 15, 2024
2 parents 4fac0d3 + 0b54793 commit 84bfe8c
Show file tree
Hide file tree
Showing 10 changed files with 16 additions and 18 deletions.
4 changes: 2 additions & 2 deletions Content.Shared/Atmos/Atmospherics.cs
Original file line number Diff line number Diff line change
Expand Up @@ -293,12 +293,12 @@ public static class Atmospherics
/// The amount of pressure damage someone takes is equal to ((pressure / HAZARD_HIGH_PRESSURE) - 1)*PRESSURE_DAMAGE_COEFFICIENT,
/// with the maximum of MaxHighPressureDamage.
/// </summary>
public const float PressureDamageCoefficient = 4;
public const float PressureDamageCoefficient = 1; // Sunrise-Casual

/// <summary>
/// Maximum amount of damage that can be endured with high pressure.
/// </summary>
public const int MaxHighPressureDamage = 4;
public const int MaxHighPressureDamage = 1; // Sunrise-Casual

/// <summary>
/// The amount of damage someone takes when in a low pressure area
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
- type: Barotrauma
damage:
types:
Blunt: 0.45
Blunt: 0.1 # Sunrise-Casual
- type: Reactive
groups:
Flammable: [ Touch ]
Expand Down
4 changes: 2 additions & 2 deletions Resources/Prototypes/Entities/Mobs/Player/arachnid.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
- type: Respirator
damage:
types:
Asphyxiation: 1.5 # This makes space and crit more lethal to arachnids.
Asphyxiation: 0.5 # Sunrise-Casual
damageRecovery:
types:
Asphyxiation: -0.5
Asphyxiation: -1.0
5 changes: 2 additions & 3 deletions Resources/Prototypes/Entities/Mobs/Species/base.yml
Original file line number Diff line number Diff line change
Expand Up @@ -253,8 +253,7 @@
- type: Barotrauma
damage:
types:
Blunt: 0.50 #per second, scales with pressure and other constants.
Heat: 0.1
Blunt: 0.1 # Sunrise-Casual
- type: PassiveDamage # Slight passive regen. Assuming one damage type, comes out to about 4 damage a minute.
allowedStates:
- Alive
Expand Down Expand Up @@ -300,7 +299,7 @@
- type: Respirator
damage:
types:
Asphyxiation: 1.0
Asphyxiation: 0.5 # Sunrise-Casual
damageRecovery:
types:
Asphyxiation: -1.0
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Entities/Mobs/Species/dwarf.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
- type: Respirator
damage:
types:
Asphyxiation: 2
Asphyxiation: 0.5 # Sunrise-Casual
damageRecovery:
types:
Asphyxiation: -1.0
Expand Down
5 changes: 2 additions & 3 deletions Resources/Prototypes/Entities/Mobs/Species/slime.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,7 @@
- type: Barotrauma
damage:
types:
Blunt: 0.50 #per second, scales with pressure and other constants.
Heat: 0.2 # 0.1 more than humans, i feel like low pressure would make slime boil more than blunt stretch them so i decided on this instead.
Blunt: 0.1 # Sunrise-Casual
- type: Reactive
groups:
Flammable: [ Touch ]
Expand Down Expand Up @@ -107,7 +106,7 @@
- type: Respirator
damage:
types:
Asphyxiation: 0.2
Asphyxiation: 0.5 # Sunrise-Casual
damageRecovery:
types:
Asphyxiation: -1.0
Expand Down
4 changes: 2 additions & 2 deletions Resources/Prototypes/Entities/Mobs/base.yml
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@
- type: Barotrauma
damage:
types:
Blunt: 0.15 #per second, scales with pressure and other constants.
Blunt: 0.1 # Sunrise-Casual

# Used for mobs that can be set on fire
- type: entity
Expand Down Expand Up @@ -220,7 +220,7 @@
- type: Respirator
damage:
types:
Asphyxiation: 2
Asphyxiation: 0.5 # Sunrise-Casual
damageRecovery:
types:
Asphyxiation: -1.0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
- type: Respirator
damage:
types:
Asphyxiation: 1.0
Asphyxiation: 0.5
damageRecovery:
types:
Asphyxiation: -1.0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,10 +67,10 @@
- type: Respirator
damage:
types:
Asphyxiation: 1.5
Asphyxiation: 0.5
damageRecovery:
types:
Asphyxiation: -1.5
Asphyxiation: -1.0
- type: NpcFactionMember
factions:
- NanoTrasen
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
- type: Respirator
damage:
types:
Asphyxiation: 0.2
Asphyxiation: 0.5
damageRecovery:
types:
Asphyxiation: -1.0
Expand Down

0 comments on commit 84bfe8c

Please sign in to comment.