From 9e835d4ce45cf648d1605ecc08ace4a377bc7ad2 Mon Sep 17 00:00:00 2001 From: Dvir Date: Sat, 12 Aug 2023 13:51:09 +0300 Subject: [PATCH 1/4] Expo Mob Fix --- .../Prototypes/Entities/Mobs/NPCs/xeno.yml | 2 - .../Entities/Mobs/Player/dragon.yml | 1 + .../Procedural/salvage_factions.yml | 2 +- .../_NF/Entities/Mobs/NPCs/xeno.yml | 47 +++++++++++++++++++ 4 files changed, 49 insertions(+), 3 deletions(-) create mode 100644 Resources/Prototypes/_NF/Entities/Mobs/NPCs/xeno.yml diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml b/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml index 3972dd11a11..0e3ee42a601 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml @@ -233,8 +233,6 @@ - type: Tag tags: - CannotSuicide - - type: ReplacementAccent - accent: genericAggressive - type: entity name: Ravager diff --git a/Resources/Prototypes/Entities/Mobs/Player/dragon.yml b/Resources/Prototypes/Entities/Mobs/Player/dragon.yml index eb57e32ec2a..57c4ab0309a 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/dragon.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/dragon.yml @@ -158,3 +158,4 @@ spawned: - id: FoodMeatDragon amount: 1 + - type: SalvageMobRestrictions diff --git a/Resources/Prototypes/Procedural/salvage_factions.yml b/Resources/Prototypes/Procedural/salvage_factions.yml index 74757697f20..67363f9aaca 100644 --- a/Resources/Prototypes/Procedural/salvage_factions.yml +++ b/Resources/Prototypes/Procedural/salvage_factions.yml @@ -32,7 +32,7 @@ configs: DefenseStructure: XenoWardingTower Mining: Xenos - Megafauna: MobXenoQueen + Megafauna: MobXenoQueenDungeon - type: salvageFaction id: Carps diff --git a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/xeno.yml b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/xeno.yml new file mode 100644 index 00000000000..f08a22487d9 --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/xeno.yml @@ -0,0 +1,47 @@ +- type: entity + parent: MobXenoQueen + id: MobXenoQueenDungeon + suffix: Dungeon + components: + - type: Sprite + drawdepth: Mobs + sprite: Mobs/Aliens/Xenos/queen.rsi + offset: 0,0.4 + layers: + - map: ["enum.DamageStateVisualLayers.Base"] + state: running + - type: MobThresholds + thresholds: + 0: Alive + 300: Dead + - type: Stamina + critThreshold: 1500 + - type: MovementSpeedModifier + baseWalkSpeed: 2.8 + baseSprintSpeed: 3.8 + - type: MeleeWeapon + hidden: true + damage: + groups: + Brute: 20 + - type: SlowOnDamage + speedModifierThresholds: + 250: 0.4 + 200: 0.7 + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeCircle + radius: 0.45 + density: 15500 + mask: + - MobMask + layer: + - MobLayer + - type: Tag + tags: + - CannotSuicide + - type: SalvageMobRestrictions + - type: ReplacementAccent + accent: Xeno From 5ec998b2ba1dcec2a642da6a94dc69148726ade9 Mon Sep 17 00:00:00 2001 From: Dvir Date: Sat, 12 Aug 2023 14:07:07 +0300 Subject: [PATCH 2/4] Remove missing crates --- Resources/Prototypes/Procedural/salvage_rewards.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Procedural/salvage_rewards.yml b/Resources/Prototypes/Procedural/salvage_rewards.yml index e13a9bad96d..5afe73d68d0 100644 --- a/Resources/Prototypes/Procedural/salvage_rewards.yml +++ b/Resources/Prototypes/Procedural/salvage_rewards.yml @@ -8,8 +8,8 @@ CrateMaterialSteel: 1.0 # things the station might want CrateEngineeringAMEJar: 0.25 - CrateFoodPizzaLarge: 0.25 - CrateFoodSoftdrinks: 0.25 + #CrateFoodPizzaLarge: 0.25 + #CrateFoodSoftdrinks: 0.25 CrateFunATV: 0.25 CrateFunInstrumentsVariety: 0.25 CrateSalvageEquipment: 0.25 From 00e03fb71046ec4326f11c172e515e4dab89c9f9 Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Sun, 13 Aug 2023 09:47:51 +0300 Subject: [PATCH 3/4] Update xeno.yml --- Resources/Prototypes/_NF/Entities/Mobs/NPCs/xeno.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/xeno.yml b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/xeno.yml index f08a22487d9..de77021fb85 100644 --- a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/xeno.yml +++ b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/xeno.yml @@ -44,4 +44,4 @@ - CannotSuicide - type: SalvageMobRestrictions - type: ReplacementAccent - accent: Xeno + accent: xeno From c842c916e980f54dfd87f5d924f484dee51543d6 Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Sun, 13 Aug 2023 10:10:55 +0300 Subject: [PATCH 4/4] Update xeno.yml --- .../_NF/Entities/Mobs/NPCs/xeno.yml | 38 +------------------ 1 file changed, 1 insertion(+), 37 deletions(-) diff --git a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/xeno.yml b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/xeno.yml index de77021fb85..89a1482b633 100644 --- a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/xeno.yml +++ b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/xeno.yml @@ -1,44 +1,8 @@ - type: entity + name: Queen parent: MobXenoQueen id: MobXenoQueenDungeon - suffix: Dungeon components: - - type: Sprite - drawdepth: Mobs - sprite: Mobs/Aliens/Xenos/queen.rsi - offset: 0,0.4 - layers: - - map: ["enum.DamageStateVisualLayers.Base"] - state: running - - type: MobThresholds - thresholds: - 0: Alive - 300: Dead - - type: Stamina - critThreshold: 1500 - - type: MovementSpeedModifier - baseWalkSpeed: 2.8 - baseSprintSpeed: 3.8 - - type: MeleeWeapon - hidden: true - damage: - groups: - Brute: 20 - - type: SlowOnDamage - speedModifierThresholds: - 250: 0.4 - 200: 0.7 - - type: Fixtures - fixtures: - fix1: - shape: - !type:PhysShapeCircle - radius: 0.45 - density: 15500 - mask: - - MobMask - layer: - - MobLayer - type: Tag tags: - CannotSuicide