Skip to content
This repository has been archived by the owner on Nov 1, 2024. It is now read-only.

PRедложка #345

Closed
wants to merge 3 commits into from
Closed
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
2 changes: 1 addition & 1 deletion Content.Shared/Preferences/HumanoidCharacterProfile.cs
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public sealed partial class HumanoidCharacterProfile : ICharacterProfile
private static readonly Regex ICNameCaseRegex = new(@"^(?<word>\w)|\b(?<word>\w)(?=\w*$)");

public const int MaxNameLength = 32;
public const int MaxDescLength = 512;
public const int MaxDescLength = 1024;

public const int DefaultBalance = 25000;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
types:
Piercing: 5
Blunt: 4
penetrationProb: 0.06 #CorvaxFrontier
penetrationScore: 1

- type: entity #FrontierCorvax
id: BulletVector22Incendiary
Expand Down Expand Up @@ -57,6 +59,7 @@
types:
Piercing: 17
Blunt: 6
penetrationProb: 0.51 #CorvaxFrontier
penetrationScore: 1

- type: entity #FrontierCorvax
Expand Down Expand Up @@ -94,6 +97,8 @@
Piercing: 6
Blunt: 3
Radiation: 14
penetrationProb: 0.23 #CorvaxFrontier
penetrationScore: 1

- type: entity
id: BulletVector45AP
Expand All @@ -106,5 +111,6 @@
types:
Piercing: 12
Blunt: 3 # 20% decrease
penetrationScore: 2
penetrationProb: 0.69 #CorvaxFrontier
penetrationScore: 1
ignoreResistances: true
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
types:
Piercing: 40
Structural: 30
penetrationProb: 1 #CorvaxFrontier
penetrationScore: 3
- type: StaminaDamageOnCollide
damage: 35
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
noSpawn: true
components:
- type: Projectile
penetrationProb: 0.19 #CorvaxFrontier
penetrationScore: 1
damage:
types:
Piercing: 19
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
damage:
types:
Piercing: 19
penetrationProb: 0.53 #CorvaxFrontier
penetrationScore: 1

- type: entity
Expand All @@ -20,4 +21,5 @@
damage:
types:
Piercing: 5
penetrationProb: 0.04 #CorvaxFrontier
penetrationScore: 1
Original file line number Diff line number Diff line change
@@ -1,18 +1,19 @@
- type: entity
id: BulletLightRifle
name: bullet (.20 rifle)
name: bullet (.30 rifle)
parent: BaseBullet
noSpawn: true
components:
- type: Projectile
damage:
types:
Piercing: 19
penetrationProb: 0.53 #CorvaxFrontier
penetrationScore: 1

- type: entity
id: BulletLightRiflePractice
name: bullet (.20 rifle practice)
name: bullet (.30 rifle practice)
parent: BaseBulletPractice
noSpawn: true
components:
Expand All @@ -23,7 +24,7 @@

- type: entity
id: BulletLightRifleRubber
name: bullet (.20 rifle rubber)
name: bullet (.30 rifle rubber)
parent: BaseBulletRubber
noSpawn: true
components:
Expand All @@ -35,7 +36,7 @@
- type: entity
id: BulletLightRifleIncendiary
parent: BaseBulletIncendiary
name: bullet (.20 rifle incendiary)
name: bullet (.30 rifle incendiary)
noSpawn: true
components:
- type: Projectile
Expand All @@ -47,12 +48,13 @@
- type: entity
id: BulletLightRifleUranium
parent: BaseBulletUranium
name: bullet (.20 rifle uranium)
name: bullet (.30 rifle uranium)
noSpawn: true
components:
- type: Projectile
damage:
types:
Radiation: 9
Piercing: 10
penetrationProb: 0.24 #CorvaxFrontier
penetrationScore: 1
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
damage:
types:
Piercing: 35
penetrationScore: 1
penetrationProb: 0.56 #CorvaxFrontier
penetrationScore: 2

- type: entity
id: BulletMagnumPractice
Expand Down Expand Up @@ -56,7 +57,8 @@
damage:
types:
Piercing: 26 # 20% decrease
penetrationScore: 2
penetrationProb: 0.9 #CorvaxFrontier
penetrationScore: 1
ignoreResistances: true

- type: entity
Expand All @@ -70,4 +72,5 @@
types:
Radiation: 15
Piercing: 20
penetrationProb: 0.32 #CorvaxFrontier
penetrationScore: 1
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
damage:
types:
Piercing: 16
penetrationProb: 0.13 #CorvaxFrontier
penetrationScore: 1

- type: entity
id: BulletPistolPractice
Expand Down Expand Up @@ -54,3 +56,5 @@
types:
Radiation: 6
Piercing: 10
penetrationProb: 0.07 #CorvaxFrontier
penetrationScore: 1
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
damage:
types:
Piercing: 17
penetrationProb: 0.38 #CorvaxFrontier
penetrationScore: 1

- type: entity
Expand Down Expand Up @@ -55,4 +56,5 @@
types:
Radiation: 7
Piercing: 8
penetrationScore: 1
penetrationProb: 0.2 #CorvaxFrontier
penetrationScore: 1
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
damage:
types:
Piercing: 28
penetrationProb: 0.62 #CorvaxFrontier
penetrationScore: 2

- type: entity
Expand Down Expand Up @@ -42,7 +43,6 @@
damage:
types:
Piercing: 10
penetrationScore: 1

- type: entity
id: PelletShotgunIncendiary
Expand Down Expand Up @@ -179,7 +179,6 @@
types:
Radiation: 5
Piercing: 5
penetrationScore: 1

- type: entity
id: PelletGrapeshot #tally fucking ho
Expand Down
Loading