diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml index a77bb76049..614ed6dc1c 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml @@ -179,7 +179,7 @@ Blunt: 0.6 Slash: 0.6 Piercing: 0.5 - Heat: 0.3 + Heat: 0.5 Radiation: 0.1 Caustic: 0.5 - type: ExplosionResistance diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml b/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml index 4550d029fd..ff0627f79c 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml @@ -11,6 +11,10 @@ rootTask: task: SimpleHostileCompound blackboard: + NavInteract: !type:Bool + true + NavPry: !type:Bool + true NavSmash: !type:Bool true - type: NpcFactionMember @@ -82,6 +86,17 @@ - type: NightVision toggleSound: null color: "#404040" + - type: Tool + speed: 2 + qualities: + - Prying + - type: Prying + pryPowered: !type:Bool + true + force: !type:Bool + true + useSound: + path: /Audio/Items/crowbar.ogg - type: entity parent: BaseMobCarp @@ -100,8 +115,6 @@ alive: Rainbow enum.DamageStateVisualLayers.BaseUnshaded: mouth: "" - - type: MovementSpeedModifier - baseSprintSpeed: 6 - type: entity name: magicarp @@ -148,6 +161,8 @@ energy: 0.5 - type: RgbLightController layers: [ 0 ] + - type: MovementSpeedModifier + baseSprintSpeed: 6 - type: entity id: MobCarpSalvage diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml b/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml index 5973c2ed3b..d67c9220b8 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml @@ -22,7 +22,7 @@ NavSmash: !type:Bool true - type: Tool - speed: 1.5 + speed: 2 qualities: - Prying - type: Prying @@ -140,12 +140,12 @@ - type: MobThresholds thresholds: 0: Alive - 150: Dead + 200: Dead - type: Stamina critThreshold: 300 - type: SlowOnDamage speedModifierThresholds: - 130: 0.7 + 180: 0.7 - type: Fixtures fixtures: fix1: @@ -178,10 +178,10 @@ - type: MobThresholds thresholds: 0: Alive - 150: Dead + 200: Dead - type: SlowOnDamage speedModifierThresholds: - 130: 0.7 + 180: 0.7 - type: MeleeWeapon damage: groups: @@ -256,7 +256,7 @@ - type: MobThresholds thresholds: 0: Alive - 100: Dead + 150: Dead - type: MovementSpeedModifier baseSprintSpeed: 4 - type: MeleeWeapon @@ -265,7 +265,7 @@ Brute: 20 - type: SlowOnDamage speedModifierThresholds: - 80: 0.7 + 130: 0.7 - type: Fixtures fixtures: fix1: @@ -322,6 +322,10 @@ spawned: - id: FoodMeatRouny amount: 3 + - type: MeleeWeapon + damage: + groups: + Brute: 15 - type: entity name: Spitter diff --git a/Resources/Prototypes/Entities/Mobs/Player/dragon.yml b/Resources/Prototypes/Entities/Mobs/Player/dragon.yml index c2534e6d0e..451fb132bb 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/dragon.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/dragon.yml @@ -131,6 +131,17 @@ - type: NightVision toggleSound: null color: "#404040" + - type: Tool + speed: 3 + qualities: + - Prying + - type: Prying + pryPowered: !type:Bool + true + force: !type:Bool + true + useSound: + path: /Audio/Items/crowbar.ogg - type: entity parent: BaseMobDragon @@ -151,6 +162,13 @@ components: - type: GhostRole description: ghost-role-information-space-dragon-dungeon-description + - type: MobThresholds + thresholds: + 0: Alive + 200: Dead + - type: SlowOnDamage + speedModifierThresholds: + 180: 0.7 # less meat spawned since it's a lot easier to kill - type: Butcherable spawned: @@ -159,7 +177,7 @@ - type: MeleeWeapon damage: groups: - Brute: 20 + Brute: 25 - type: ExpeditionGhostRole - type: entity diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml index 71ba30fb3e..7c3df718df 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml @@ -1106,7 +1106,7 @@ - type: Projectile damage: types: - Heat: 9 + Heat: 10 - type: Trail scale: 0.03, 0.0 diff --git a/Resources/Prototypes/Procedural/salvage_difficulties.yml b/Resources/Prototypes/Procedural/salvage_difficulties.yml index a87cd15548..067ba42552 100644 --- a/Resources/Prototypes/Procedural/salvage_difficulties.yml +++ b/Resources/Prototypes/Procedural/salvage_difficulties.yml @@ -1,6 +1,6 @@ - type: salvageDifficulty id: Minimal - lootBudget: 10 + lootBudget: 5 mobBudget: 10 modifierBudget: 1 color: "#9FED5896" @@ -8,7 +8,7 @@ - type: salvageDifficulty id: Minor - lootBudget: 30 + lootBudget: 15 mobBudget: 30 modifierBudget: 1 color: "#EFB34196" @@ -16,24 +16,24 @@ - type: salvageDifficulty id: Moderate - lootBudget: 50 - mobBudget: 50 + lootBudget: 30 + mobBudget: 60 modifierBudget: 2 color: "#52B4E996" recommendedPlayers: 2 - type: salvageDifficulty id: Hazardous - lootBudget: 70 - mobBudget: 70 + lootBudget: 50 + mobBudget: 100 modifierBudget: 2 color: "#DE3A3A96" recommendedPlayers: 3 - type: salvageDifficulty id: Extreme - lootBudget: 100 - mobBudget: 100 + lootBudget: 75 + mobBudget: 150 modifierBudget: 3 color: "#D381C996" recommendedPlayers: 4 diff --git a/Resources/Prototypes/Procedural/salvage_factions.yml b/Resources/Prototypes/Procedural/salvage_factions.yml index cbd1dd4aa1..9187ff1ce0 100644 --- a/Resources/Prototypes/Procedural/salvage_factions.yml +++ b/Resources/Prototypes/Procedural/salvage_factions.yml @@ -6,21 +6,24 @@ cost: 2 - proto: MobXenoPraetorian cost: 5 - prob: 0.1 + prob: 0.5 - proto: MobXenoQueen cost: 10 - prob: 0.02 + prob: 0.1 - proto: MobXenoRavager - cost: 5 + cost: 4 - proto: MobXenoRunner cost: 2 - proto: MobXenoRouny - cost: 3 - prob: 0.02 + cost: 2 + prob: 0.5 - proto: MobXenoSpitter cost: 3 - proto: WeaponTurretXeno prob: 0.1 + - proto: MobLaserRaptor + cost: 5 + prob: 0.5 configs: DefenseStructure: XenoWardingTower Megafauna: MobXenoQueen @@ -31,20 +34,23 @@ - proto: MobCarpDungeon # These do too much damage for salvage, need nerfs - proto: MobCarpHolo - cost: 5 - prob: 0.05 + cost: 8 + prob: 0.25 - proto: MobCarpMagic - cost: 4 - prob: 0.1 + cost: 2 + prob: 0.5 - proto: MobCarpRainbow # carp version of rouny... - cost: 6 - prob: 0.05 + cost: 4 + prob: 0.5 - proto: MobShark cost: 8 - prob: 0.035 + prob: 0.25 - proto: MobDragonDungeon cost: 12 - prob: 0.02 + prob: 0.1 + - proto: MobLaserRaptor + cost: 5 + prob: 0.5 configs: DefenseStructure: CarpStatue Megafauna: MobDragonDungeon diff --git a/Resources/Prototypes/Procedural/salvage_loot.yml b/Resources/Prototypes/Procedural/salvage_loot.yml index 7c4bf2a8f0..17bfe7ad02 100644 --- a/Resources/Prototypes/Procedural/salvage_loot.yml +++ b/Resources/Prototypes/Procedural/salvage_loot.yml @@ -107,97 +107,119 @@ cost: 2 - proto: EnergyBattleAxe prob: 0.1 - cost: 8 + cost: 20 - proto: WeaponRifleAk - cost: 5 + cost: 16 - proto: TimeBeacon cost: 2 prob: 0.5 - proto: ClothingBackpackDuffelSyndicateFilledSMG - cost: 6 - prob: 0.5 + cost: 15 + prob: 0.2 - proto: ClothingBackpackDuffelSyndicateFilledShotgun - cost: 8 - prob: 0.5 + cost: 17 + prob: 0.2 - proto: BriefcaseSyndieSniperBundleFilled - cost: 10 - prob: 0.5 + cost: 20 + prob: 0.2 - proto: ClothingBackpackDuffelSyndicateFilledLMG - cost: 12 - prob: 0.5 + cost: 25 + prob: 0.2 - proto: WeaponRevolverMateba - cost: 5 + cost: 10 + prob: 0.1 - proto: WeaponRevolverDeckard - cost: 4 + cost: 10 - proto: ExGrenade - cost: 3 + cost: 8 - proto: SupermatterGrenade - cost: 5 + cost: 12 - proto: WhiteholeGrenade - cost: 3 - - proto: ClothingOuterHardsuitMaxim cost: 5 + - proto: ClothingOuterHardsuitMaxim + cost: 12 - proto: GrenadeIncendiary - cost: 4 + cost: 8 - proto: ExperimentalSyndicateTeleporter cost: 8 - prob: 0.5 + prob: 0.2 - proto: ClothingHeadHelmetSwat cost: 4 + prob: 0.5 - proto: ClothingBeltMilitaryWebbing cost: 2 - proto: ClothingOuterVestWeb cost: 5 + prob: 0.5 - proto: ClothingEyesNightVisionGoggles - cost: 5 + cost: 8 - proto: ClothingHandsGlovesCombat cost: 3 - proto: Katana - cost: 3 + cost: 5 - proto: WeaponMakeshiftLaser - cost: 4 - - proto: WeaponLaserGun - cost: 5 - - proto: WeaponEgun - cost: 5 - - proto: WeaponXrayCannon - cost: 6 - - proto: WeaponLaserCannon - cost: 6 - - proto: WeaponTempGun - cost: 4 - - proto: WeaponAdvancedLaser cost: 10 prob: 0.5 + - proto: WeaponLaserGun + cost: 12 + prob: 0.1 + - proto: WeaponEgun + cost: 16 + prob: 0.1 + - proto: WeaponXrayCannon + cost: 18 + prob: 0.1 + - proto: WeaponLaserCannon + cost: 20 + prob: 0.1 - proto: Stimpack - cost: 6 - - proto: StimkitFilled cost: 8 prob: 0.5 + - proto: StimkitFilled + cost: 12 + prob: 0.5 - proto: CrateSecurityRiot - cost: 5 + cost: 12 prob: 0.5 - proto: CrateSecurityNonlethal - cost: 4 + cost: 10 prob: 0.5 - proto: ClothingShoesBootsMagSyndie - cost: 5 + cost: 4 + prob: 0.2 - proto: JetpackBlackFilled cost: 3 + prob: 0.5 - proto: WeaponLauncherRocket - cost: 8 + cost: 20 - proto: WeaponLauncherPirateCannon - cost: 5 + cost: 15 - proto: LightModule - cost: 2 - - proto: LaserModule - cost: 4 - - proto: FlameHiderModule - cost: 2 - - proto: SilencerModule cost: 3 - - proto: AcceleratorModule + - proto: LaserModule + cost: 8 + - proto: FlameHiderModule + cost: 3 + - proto: SilencerModule cost: 5 + - proto: AcceleratorModule + cost: 12 + - proto: MedkitFilled + cost: 3 + - proto: MedkitRadiationFilled + cost: 5 + - proto: MedkitOxygenFilled + cost: 3 + - proto: MedkitBruteFilled + cost: 5 + - proto: MedkitCombatFilled + cost: 10 + - proto: MedkitToxinFilled + cost: 5 + - proto: MedkitBurnFilled + cost: 5 + - proto: MedkitAdvancedFilled + cost: 8 # Mob loot table