Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Revert "Refactor Damage to use Protoypes (#4262)"

Browse Source 
This reverts commit 20bf5739a9.
This commit is contained in:
Silver
2021-08-24 00:50:39 -06:00
committed by Silver
parent 20bf5739a9
commit e708091518
121 changed files with 711 additions and 10237 deletions
Download Patch File Download Diff File Expand all files Collapse all files

101
Resources/Prototypes/Body/Mechanisms/human.yml
View File

@@ -121,120 +121,64 @@
# You're technically 'immune to poison' without a heart, but.. uhh, you'll have bigger problems on your hands.
- type: Metabolizer
metabolisms:
<<<<<<< HEAD
<<<<<<< refs/remotes/origin/master
<<<<<<< refs/remotes/origin/master
=======
Dylovene:
effects:
- !type:HealthChange
damageGroup: Toxin
healthChange: -1
>>>>>>> Refactor damageablecomponent update (#4406)
=======
>>>>>>> Bring refactor-damageablecomponent branch up-to-date with master (#4510)
=======
>>>>>>> refactor-damageablecomponent
Arithrazine:
effects:
- !type:HealthChange
damageGroup: Toxin
damageClass: Toxin
healthChange: -1
- !type:HealthChange
damageGroup: Brute
damageClass: Brute
healthChange: 0.5
Bicaridine:
effects:
- !type:HealthChange
damageGroup: Brute
damageClass: Brute
healthChange: -2
Dermaline:
effects:
- !type:HealthChange
damageGroup: Burn
damageClass: Burn
healthChange: -3
Dexalin:
effects:
- !type:HealthChange
damageGroup: Airloss
damageClass: Airloss
healthChange: -1
DexalinPlus:
effects:
- !type:HealthChange
damageGroup: Airloss
damageClass: Airloss
healthChange: -3
Dylovene:
<<<<<<< HEAD
effects:
<<<<<<< refs/remotes/origin/master
- !type:HealthChange
damageClass: Toxin
healthChange: -1
Ephedrine:
=======
>>>>>>> refactor-damageablecomponent
effects:
- !type:MovespeedModifier
walkSpeedModifier: 1.2
sprintSpeedModifier: 1.2
=======
- !type:HealthChange
damageGroup: Toxin
healthChange: -1
Ephedrine:
effects:
<<<<<<< HEAD
<<<<<<< refs/remotes/origin/master
- !type:HealthChange
damageGroup: Toxin
healthChange: 0.5
>>>>>>> Refactor damageablecomponent update (#4406)
=======
- !type:MovespeedModifier
walkSpeedModifier: 1.2
sprintSpeedModifier: 1.2
>>>>>>> Bring refactor-damageablecomponent branch up-to-date with master (#4510)
=======
- !type:MovespeedModifier
walkSpeedModifier: 1.2
sprintSpeedModifier: 1.2
>>>>>>> refactor-damageablecomponent
HeartbreakerToxin:
effects:
- !type:HealthChange
damageGroup: Airloss
damageClass: Airloss
healthChange: 4
Kelotane:
effects:
- !type:HealthChange
<<<<<<< HEAD
<<<<<<< refs/remotes/origin/master
damageClass: Burn
=======
damageGroup: Burn
>>>>>>> Bring refactor-damageablecomponent branch up-to-date with master (#4510)
=======
damageGroup: Burn
>>>>>>> refactor-damageablecomponent
healthChange: -1
Lexorin:
effects:
- !type:HealthChange
damageGroup: Airloss
damageClass: Airloss
healthChange: 7
Meth:
effects:
- !type:HealthChange
healthChange: 2.5
<<<<<<< HEAD
<<<<<<< refs/remotes/origin/master
damageClass: Toxin
=======
damageGroup: Toxin
>>>>>>> Bring refactor-damageablecomponent branch up-to-date with master (#4510)
=======
damageGroup: Toxin
>>>>>>> refactor-damageablecomponent
- !type:MovespeedModifier
walkSpeedModifier: 1.3
sprintSpeedModifier: 1.3
@@ -242,40 +186,21 @@
effects:
- !type:HealthChange
healthChange: -2
damageGroup: Burn
damageClass: Burn
- !type:HealthChange
healthChange: -2
damageGroup: Toxin
damageClass: Toxin
- !type:HealthChange
healthChange: -2
damageGroup: Airloss
damageClass: Airloss
- !type:HealthChange
healthChange: -2
<<<<<<< HEAD
<<<<<<< refs/remotes/origin/master
damageClass: Brute
Synaptizine:
effects:
- !type:HealthChange
damageClass: Toxin
healthChange: 0.5
=======
damageGroup: Brute
<<<<<<< refs/remotes/origin/master
>>>>>>> Refactor damageablecomponent update (#4406)
=======
=======
damageGroup: Brute
>>>>>>> refactor-damageablecomponent
Synaptizine:
effects:
- !type:HealthChange
damageGroup: Toxin
healthChange: 0.5
<<<<<<< HEAD
>>>>>>> Bring refactor-damageablecomponent branch up-to-date with master (#4510)
=======
>>>>>>> refactor-damageablecomponent
- type: entity
id: OrganHumanStomach
@@ -334,7 +259,7 @@
effects:
- !type:SatiateThirst
- !type:HealthChange
damageGroup: Toxin
damageClass: Toxin
healthChange: 1
JuiceWatermelon:
effects:
@@ -379,7 +304,7 @@
- !type:SatiateThirst
hydrationFactor: 2
- !type:HealthChange
damageGroup: Toxin
damageClass: Toxin
healthChange: 1
- type: entity

6
Resources/Prototypes/Catalog/Research/technologies.yml
View File

@@ -243,8 +243,6 @@
- APCElectronics
- CloningPodMachineCircuitboard
- MedicalScannerMachineCircuitboard
<<<<<<< HEAD
<<<<<<< refs/remotes/origin/master
# Basic Parts Technology Tree
@@ -264,10 +262,6 @@
- MicroLaserStockPart
- MicroManipulatorStockPart
- ScanningModuleStockPart
=======
>>>>>>> Bring refactor-damageablecomponent branch up-to-date with master (#4510)
=======
>>>>>>> refactor-damageablecomponent
# Bluespace Theory Technology Tree

97
Resources/Prototypes/Damage/damage.yml
View File

@@ -1,97 +0,0 @@
# Silver: Todo break out into damage_type,damage_class, damage_container yml files when we support loading prototypes by priority.
- type: damageType
id: Blunt
- type: damageType
id: Slash
- type: damageType
id: Piercing
- type: damageType
id: Heat
- type: damageType
id: Shock
- type: damageType
id: Cold
# Poison damage. Generally caused by various reagents being metabolised.
- type: damageType
id: Poison
- type: damageType
id: Radiation
# Damage due to being unable to breathe.
# Represents not enough oxygen (or equivalent) getting to the blood.
# Usually healed automatically if entity can breathe
- type: damageType
id: Asphyxiation
# Damage representing not having enough blood.
# Represents there not enough blood to supply oxygen (or equivalent).
- type: damageType
id: Bloodloss
- type: damageType
id: Cellular
- type: damageGroup
id: Brute
damageTypes:
- Blunt
- Slash
- Piercing
- type: damageGroup
id: Burn
damageTypes:
- Heat
- Shock
- Cold
# Airloss (sometimes called oxyloss)
# Caused by asphyxiation or bloodloss.
# Note that most medicine and damaging effects should probably modify either asphyxiation or
# bloodloss, not this whole group, unless you have a wonder drug that affects both.
- type: damageGroup
id: Airloss
damageTypes:
- Asphyxiation
- Bloodloss
# As with airloss, most medicine and damage effects should probably modify either poison or radiation.
# Though there are probably some radioactive poisons.
- type: damageGroup
id: Toxin
damageTypes:
- Poison
- Radiation
- type: damageGroup
id: Genetic
damageTypes:
- Cellular
- type: damageContainer
id: allDamageContainer
supportAll: true
- type: damageContainer
id: biologicalDamageContainer
supportedGroups:
- Brute
- Burn
- Toxin
- Airloss
- Genetic
- type: damageContainer
id: metallicDamageContainer
supportedGroups:
- Brute
- Burn

18
Resources/Prototypes/Damage/damage_containers.yml Normal file
View File

@@ -0,0 +1,18 @@
- type: damageContainer
id: allDamageContainer
supportAll: true
- type: damageContainer
id: biologicalDamageContainer
supportedClasses:
- Brute
- Burn
- Toxin
- Airloss
- Genetic
- type: damageContainer
id: metallicDamageContainer
supportedClasses:
- Brute
- Burn

13
Resources/Prototypes/Entities/Mobs/Species/human.yml
View File

@@ -34,7 +34,6 @@
- type: MovementSpeedModifier
- type: MovedByPressure
- type: Barotrauma
damageType: Blunt
- type: DamageOnHighSpeedImpact
soundHit:
path: /Audio/Effects/hit_kick.ogg
@@ -158,9 +157,7 @@
fireSpread: true
canResistFire: true
- type: Temperature
heatDamageType: Heat
heatDamageThreshold: 360
coldDamageType: Cold
coldDamageThreshold: 260
currentTemperature: 310.15
specificHeat: 42
@@ -171,15 +168,7 @@
preset: HumanPreset
- type: Damageable
damageContainer: biologicalDamageContainer
<<<<<<< refs/remotes/origin/master
- type: Respirator
<<<<<<< refs/remotes/origin/master
=======
- type: Metabolism
damageType: Blunt
>>>>>>> all thats left is bug/missing node hunting then verification.
=======
>>>>>>> Refactor damageablecomponent update (#4406)
metabolismHeat: 5000
radiatedHeat: 400
implicitHeatRegulation: 5000
@@ -202,7 +191,7 @@
thresholds:
- trigger:
!type:DamageTypeTrigger
damageType: Blunt
type: Blunt
damage: 400
behaviors:
- !type:GibBehavior { }

2
Resources/Prototypes/Entities/Mobs/Species/vox.yml
View File

@@ -1,4 +1,4 @@
# Vox bad. moff best.
# SKREEEEEEEEEEE
- type: entity
parent: HumanMob_Content
abstract: True

76
Resources/Prototypes/Entities/Objects/Tools/cable_coils.yml
View File

@@ -64,8 +64,6 @@
name: MV cable coil
suffix: Full
components:
<<<<<<< HEAD
<<<<<<< refs/remotes/origin/master
- type: Stack
stackType: CableMV
- type: Sprite
@@ -76,40 +74,13 @@
- type: CablePlacer
cablePrototypeID: CableMV
blockingCableType: MediumVoltage
=======
=======
>>>>>>> refactor-damageablecomponent
- type: Sprite
state: coillv-30
- type: Item
size: 10
HeldPrefix: coillv
- type: CablePlacer
cablePrototypeID: CableApcExtension
blockingCableType: Apc
<<<<<<< HEAD
>>>>>>> Bring refactor-damageablecomponent branch up-to-date with master (#4510)
=======
>>>>>>> refactor-damageablecomponent
- type: Appearance
visuals:
- type: StackVisualizer
stackLayers:
<<<<<<< HEAD
<<<<<<< refs/remotes/origin/master
- coilmv-10
- coilmv-20
- coilmv-30
=======
- coillv-10
- coillv-20
- coillv-30
>>>>>>> Bring refactor-damageablecomponent branch up-to-date with master (#4510)
=======
- coillv-10
- coillv-20
- coillv-30
>>>>>>> refactor-damageablecomponent
- type: entity
parent: CableMVStack
@@ -117,15 +88,7 @@
suffix: 1
components:
- type: Sprite
<<<<<<< HEAD
<<<<<<< refs/remotes/origin/master
state: coilmv-10
=======
state: coillv-10
>>>>>>> Bring refactor-damageablecomponent branch up-to-date with master (#4510)
=======
state: coillv-10
>>>>>>> refactor-damageablecomponent
- type: Item
size: 3
- type: Stack
@@ -138,8 +101,6 @@
description: Low-Voltage stack of wires for connecting APCs to machines and other purposes.
suffix: Full
components:
<<<<<<< HEAD
<<<<<<< refs/remotes/origin/master
- type: Sprite
state: coillv-30
- type: Item
@@ -148,42 +109,13 @@
- type: CablePlacer
cablePrototypeID: CableApcExtension
blockingCableType: Apc
=======
=======
>>>>>>> refactor-damageablecomponent
- type: Stack
stackType: CableMV
- type: Sprite
state: coilmv-30
- type: Item
size: 10
HeldPrefix: coilmv
- type: CablePlacer
cablePrototypeID: CableMV
blockingCableType: MediumVoltage
<<<<<<< HEAD
>>>>>>> Bring refactor-damageablecomponent branch up-to-date with master (#4510)
=======
>>>>>>> refactor-damageablecomponent
- type: Appearance
visuals:
- type: StackVisualizer
stackLayers:
<<<<<<< HEAD
<<<<<<< refs/remotes/origin/master
- coillv-10
- coillv-20
- coillv-30
=======
- coilmv-10
- coilmv-20
- coilmv-30
>>>>>>> Bring refactor-damageablecomponent branch up-to-date with master (#4510)
=======
- coilmv-10
- coilmv-20
- coilmv-30
>>>>>>> refactor-damageablecomponent
- type: entity
parent: CableApcStack
@@ -191,15 +123,7 @@
suffix: 1
components:
- type: Sprite
<<<<<<< HEAD
<<<<<<< refs/remotes/origin/master
state: coillv-10
=======
state: coilmv-10
>>>>>>> Bring refactor-damageablecomponent branch up-to-date with master (#4510)
=======
state: coilmv-10
>>>>>>> refactor-damageablecomponent
- type: Item
size: 3
- type: Stack

7
Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml
View File

@@ -112,14 +112,7 @@
- type: Physics
fixtures:
- shape:
<<<<<<< refs/remotes/origin/master
!type:PhysShapeAabb
=======
!type:PhysShapeRect
<<<<<<< HEAD
>>>>>>> Bring refactor-damageablecomponent branch up-to-date with master (#4510)
=======
>>>>>>> refactor-damageablecomponent
bounds: "-0.2,-0.49,-0.49,0.49" # don't want this colliding with walls or they won't close
mask:
- MobImpassable