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

Ребаланс медицинских капсул #79

Closed
Closed
Changes from 11 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: 2 additions & 0 deletions Resources/Locale/ru-RU/_NF/medical/emergency-medical-pod.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ent-MedicalPodFilled = аварийная медицинская капсула
.desc = Капсула, используемая для сохранения особо ценных тел. Здесь произошло что-то ужасное.
164 changes: 82 additions & 82 deletions Resources/Prototypes/_NF/Catalog/Bounties/medical_bounties.yml
Original file line number Diff line number Diff line change
@@ -5,69 +5,69 @@
Blunt:
min: 150
max: 400
value: 10
penalty: 10
value: 20
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Нету # Corvax-Frontier во всех измененных строках

penalty: 100
Asphyxiation:
min: 50
max: 200
value: 10
penalty: 10
baseReward: 2000 # 4K-8K
penalty: 100
baseReward: 2000 # 5500-12000

- type: medicalBounty
id: MurderedPierce
damageSets:
Piercing:
min: 150
max: 400
value: 10
penalty: 10
value: 20
penalty: 100
Bloodloss:
min: 50
max: 200
value: 10
penalty: 10
baseReward: 2000 # 4K-8K
value: 15
penalty: 100
baseReward: 2000 # 5750-13000

- type: medicalBounty
id: MurderedSlash
damageSets:
Slash:
min: 150
max: 400
value: 10
penalty: 10
value: 20
penalty: 100
Bloodloss:
min: 50
max: 200
value: 10
penalty: 10
baseReward: 2000 # 4K-8K
value: 15
penalty: 100
baseReward: 2000 # 5750-13000

- type: medicalBounty
id: MildBruteMix
damageSets:
Blunt:
min: 75
max: 150
value: 10
penalty: 10
value: 20
penalty: 100
Piercing:
min: 75
max: 150
value: 10
penalty: 10
value: 20
penalty: 100
Slash:
min: 75
max: 150
value: 10
penalty: 10
value: 20
penalty: 100
Bloodloss:
min: 75
max: 150
value: 10
penalty: 10
baseReward: 2000 # 5K-8K
value: 15
penalty: 100
baseReward: 2000 # 7625-13250

- type: medicalBounty
id: Suffocated
@@ -76,147 +76,147 @@
min: 150
max: 400
value: 10
penalty: 10
penalty: 100
Bloodloss:
min: 50
max: 200
value: 10
penalty: 10
baseReward: 2000 # 4K-8K
value: 15
penalty: 100
baseReward: 2000 # 4250-9000

- type: medicalBounty
id: PlasmaFire
damageSets:
Heat:
min: 1000
max: 3000
value: 10
penalty: 10
baseReward: 2000 # 10K-32K
value: 20
penalty: 100
baseReward: 2000 # 20K-60K

- type: medicalBounty
id: Spaced
damageSets:
Blunt:
min: 50
max: 100
value: 10
penalty: 10
value: 20
penalty: 100
Piercing:
min: 50
max: 100
value: 10
penalty: 10
value: 20
penalty: 100
Slash:
min: 50
max: 100
value: 10
penalty: 10
value: 20
penalty: 100
Cold:
min: 600
max: 2000
value: 10
penalty: 10
baseReward: 1000 # 8500-24K
value: 20
penalty: 100
baseReward: 1000 # 16K-47K

- type: medicalBounty
id: MildBurnMix
damageSets:
Heat:
min: 50
max: 150
value: 10
penalty: 10
value: 20
penalty: 100
Cold:
min: 50
max: 150
value: 10
penalty: 10
value: 20
penalty: 100
Shock:
min: 50
max: 150
value: 10
penalty: 10
value: 20
penalty: 100
Caustic:
min: 50
max: 150
value: 10
penalty: 10
baseReward: 2000 # 4K-8K
value: 30
penalty: 100
baseReward: 2000 # 6500-15500

- type: medicalBounty
id: Insuls
damageSets:
Heat:
min: 200
max: 400
value: 10
penalty: 10
value: 20
penalty: 100
Shock:
min: 400
max: 600
value: 10
penalty: 10
baseReward: 1500 # 7500-11500
value: 20
penalty: 100
baseReward: 1500 # 13500-21500

- type: medicalBounty
id: AcidSlimes
damageSets:
Caustic:
min: 300
max: 500
value: 20
penalty: 20
baseReward: 2000 # 8K-12K
value: 30
penalty: 100
baseReward: 2000 # 11K-17K

- type: medicalBounty
id: SpiderAttackMild
damageSets:
Poison:
min: 100
max: 200
value: 15
penalty: 15
value: 30
penalty: 100
Asphyxiation:
min: 100
max: 200
value: 10
penalty: 10
penalty: 100
reagents:
Mechanotoxin:
min: 30
max: 50
value: 20
baseReward: 3500 # 6600-10500
baseReward: 3500 # 7500-11500

- type: medicalBounty
id: SpiderAttack
damageSets:
Poison:
min: 200
max: 400
value: 15
penalty: 15
value: 30
penalty: 100
reagents:
Mechanotoxin:
min: 30
max: 50
value: 20
baseReward: 3500 # 7100-10500
baseReward: 3500 # 9500-15500

- type: medicalBounty
id: DeliciousMushroom
damageSets:
Poison:
min: 100
max: 200
value: 15
penalty: 15
value: 30
penalty: 100
Asphyxiation:
min: 100
max: 200
value: 10
penalty: 10
penalty: 100
reagents:
Amatoxin:
min: 30
@@ -230,19 +230,19 @@
Radiation:
min: 150
max: 800
value: 15
penalty: 15
value: 30
penalty: 100
Cellular:
min: 60
max: 140
value: 25
penalty: 25
value: 50
penalty: 100
Asphyxiation:
min: 100
max: 200
value: 10
penalty: 10
baseReward: 1500 # ~6250-19K
penalty: 100
baseReward: 1500 # 10000-31700

- type: medicalBounty
id: AsphyxAndCellular
@@ -251,32 +251,32 @@
min: 200
max: 400
value: 10
penalty: 10
penalty: 100
Cellular:
min: 60
max: 140
value: 25
penalty: 25
baseReward: 2000 # 5500-9500
value: 50
penalty: 100
baseReward: 2000 # 7K-13K

- type: medicalBounty
id: DeliciousUranium
damageSets:
Radiation:
min: 50
max: 300
value: 15
penalty: 15
value: 30
penalty: 100
Cellular:
min: 60
max: 100
value: 25
penalty: 25
value: 50
penalty: 100
Asphyxiation: # Value padding
min: 100
max: 200
value: 10
penalty: 10
penalty: 100
reagents:
Uranium:
min: 30
@@ -286,4 +286,4 @@
min: 30
max: 50
value: 25
baseReward: 1500 # 5300-13500
baseReward: 1500 # 7000-17500
2 changes: 1 addition & 1 deletion Resources/Prototypes/_NF/Entities/World/Debris/wrecks.yml
Original file line number Diff line number Diff line change
@@ -85,7 +85,7 @@
- id: Window
prob: 0.05
- id: MedicalPodFilled # Medical bounties
prob: 0.05
prob: 0.01
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Тоже нету # Corvax-Frontier

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Сейчас исправим без проблем.

Размышлял ещё о том, стоит ли указывать над простыми числовыми изменениями этот тэг или это относится только к добавленным строкам кода.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Его нужно ставить во всех изменённых/добавленных строчках в папках _NF

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Принято, учтено и # Corvax-Frontier # Corvax-Frontier # Corvax-Frontier # Corvax-Frontier # Corvax-Frontier.

Lattice: &lattice
- prob: 2
- id: Grille