Наёмыши

Lost-Paradise-Project · Dec 13, 2024 · af2a06c · af2a06c
1 parent e5d7a98
commit af2a06c
Show file tree

Hide file tree

Showing 8 changed files with 239 additions and 3 deletions.
diff --git a/Resources/Locale/en-US/_LostParadise/advertisements/mobchatter/mercenaryhumanoidmob.ftl b/Resources/Locale/en-US/_LostParadise/advertisements/mobchatter/mercenaryhumanoidmob.ftl
@@ -0,0 +1,20 @@
+advertisement-mercenaryhumanoid-1 = Contact!
+advertisement-mercenaryhumanoid-2 = In position! Over.
+advertisement-mercenaryhumanoid-3 = Sights are cold!
+advertisement-mercenaryhumanoid-4 = Radio check. Over.
+advertisement-mercenaryhumanoid-5 = Check in. What's your status? Over.
+advertisement-mercenaryhumanoid-6 = Spread out!
+advertisement-mercenaryhumanoid-7 = Keep your eyes open!
+advertisement-mercenaryhumanoid-8 = Lost contact with the lookout. Over.
+advertisement-mercenaryhumanoid-9 = Finishing my patrol and heading back. Over.
+advertisement-mercenaryhumanoid-10 = Command, what's the sitrep? Over.
+advertisement-mercenaryhumanoid-11 = Target on the move!
+advertisement-mercenaryhumanoid-12 = Command, we've lost contact with the search team!
+advertisement-mercenaryhumanoid-13 = Fan out!
+advertisement-mercenaryhumanoid-14 = Any word on those reinforcements? Over.
+advertisement-mercenaryhumanoid-15 = I could use some reinforcements, command!
+advertisement-mercenaryhumanoid-16 = Orders received and understood! Over.
+advertisement-mercenaryhumanoid-17 = Watch your step.
+advertisement-mercenaryhumanoid-18 = Confirmed. Over.
+advertisement-mercenaryhumanoid-19 = In here. Over.
+advertisement-mercenaryhumanoid-20 = Neutralize the target!
diff --git a/Resources/Locale/ru-RU/_LostParadise/advertisements/mobchatter/mercenaryhumanoidmob.ftl b/Resources/Locale/ru-RU/_LostParadise/advertisements/mobchatter/mercenaryhumanoidmob.ftl
@@ -0,0 +1,20 @@
+advertisement-mercenaryhumanoid-1 = Контакт!
+advertisement-mercenaryhumanoid-2 = На позиции! Конец связи.
+advertisement-mercenaryhumanoid-3 = Не дрогнем!
+advertisement-mercenaryhumanoid-4 = Проверка радиосвязи. Принято.
+advertisement-mercenaryhumanoid-5 = Проверка. Каков ваш статус? Принято.
+advertisement-mercenaryhumanoid-6 = Рассредоточиться!
+advertisement-mercenaryhumanoid-7 = Держите глаза открытыми!
+advertisement-mercenaryhumanoid-8 = Потерян визуальный контакт. Конец связи.
+advertisement-mercenaryhumanoid-9 = Заканчиваю патрулирование и направляюсь обратно. Конец связи.
+advertisement-mercenaryhumanoid-10 = Командование, что происходит на месте? Как слышно?
+advertisement-mercenaryhumanoid-11 = Цель в движении!
+advertisement-mercenaryhumanoid-12 = Командир, мы потеряли связь с поисковой группой!
+advertisement-mercenaryhumanoid-13 = Разойтись!
+advertisement-mercenaryhumanoid-14 = Есть что-нибудь по подкреплению? Принято.
+advertisement-mercenaryhumanoid-15 = Мне бы не помешало подкрепление, командир!
+advertisement-mercenaryhumanoid-16 = Приказы получены и приняты! Конец связи.
+advertisement-mercenaryhumanoid-17 = Смотри под ноги.
+advertisement-mercenaryhumanoid-18 = Подтверждаю. Конец связи.
+advertisement-mercenaryhumanoid-19 = На позиции. Конец связи.
+advertisement-mercenaryhumanoid-20 = Нейтрализуйте цель!
diff --git a/Resources/Prototypes/_LostParadise/Catalog/NPCsChatter/mercenaryhumanoidmob.yml b/Resources/Prototypes/_LostParadise/Catalog/NPCsChatter/mercenaryhumanoidmob.yml
@@ -0,0 +1,23 @@
+- type: messagePack
+  id: mercenaryhumanoidchatter
+  messages: 
+  - advertisement-mercenaryhumanoid-1
+  - advertisement-mercenaryhumanoid-2
+  - advertisement-mercenaryhumanoid-3
+  - advertisement-mercenaryhumanoid-4
+  - advertisement-mercenaryhumanoid-5
+  - advertisement-mercenaryhumanoid-6
+  - advertisement-mercenaryhumanoid-7
+  - advertisement-mercenaryhumanoid-8
+  - advertisement-mercenaryhumanoid-9
+  - advertisement-mercenaryhumanoid-10
+  - advertisement-mercenaryhumanoid-11
+  - advertisement-mercenaryhumanoid-12
+  - advertisement-mercenaryhumanoid-13
+  - advertisement-mercenaryhumanoid-14
+  - advertisement-mercenaryhumanoid-15
+  - advertisement-mercenaryhumanoid-16
+  - advertisement-mercenaryhumanoid-17
+  - advertisement-mercenaryhumanoid-18
+  - advertisement-mercenaryhumanoid-19
+  - advertisement-mercenaryhumanoid-20
diff --git a/Resources/Prototypes/_LostParadise/Damage/modifier_sets.yml b/Resources/Prototypes/_LostParadise/Damage/modifier_sets.yml
@@ -0,0 +1,69 @@
+- type: damageModifierSet
+  id: Goblin
+  coefficients:
+    Blunt: 1.2
+    Slash: 1.2
+    Piercing: 1.2
+    Poison: 0.75
+    Caustic: 0.9
+
+- type: damageModifierSet
+  id: MobHostileDamageModifierSetLow
+  coefficients:
+    Blunt: 0.95
+    Slash: 0.95
+    Piercing: 0.95
+    Heat: 1.0
+    Caustic: 0.9
+
+- type: damageModifierSet
+  id: MobHostileDamageModifierSetMedium
+  coefficients:
+    Blunt: 0.9
+    Slash: 0.9
+    Piercing: 0.9
+    Heat: 0.95
+    Caustic: 0.9
+
+- type: damageModifierSet
+  id: MobHostileDamageModifierSetHigh
+  coefficients:
+    Blunt: 0.85
+    Slash: 0.85
+    Piercing: 0.85
+    Heat: 0.9
+    Caustic: 0.85
+
+- type: damageModifierSet
+  id: MobHostileDamageModifierSetBoss
+  coefficients:
+    Blunt: 0.5
+    Slash: 0.5
+    Piercing: 0.5
+    Heat: 0.7
+    Caustic: 0.5
+
+- type: damageModifierSet
+  id: MobMercenaryDamageModifierSet
+  coefficients:
+    Blunt: 0.75
+    Slash: 0.75
+    Piercing: 0.75
+    Heat: 0.8
+    Caustic: 0.9
+
+- type: damageModifierSet
+  id: MobRogueSiliconDamageModifierSet
+  coefficients:
+    Structural: 1.2
+    Blunt: 0.7
+    Slash: 0.5
+    Piercing: 0.7
+    Shock: 1.5
+    Caustic: 0.9
+    Radiation: 1.2
+    Cold: 0.0
+    Poison: 0.0
+    Asphyxiation: 0.0
+    Bloodloss: 0.0
+    Cellular: 0.0
diff --git a/Resources/Prototypes/_LostParadise/Entities/Mobs/NPCs/mob_hostile_bloodcultist.yml b/Resources/Prototypes/_LostParadise/Entities/Mobs/NPCs/mob_hostile_bloodcultist.yml
@@ -155,7 +155,7 @@
       collection: BulletMiss
 
 # Blood Cult Zealot, ranged mob, magic bolt deals 5 slash and 2 bloodloss
-# Look for magic bolt here:\Resources\Prototypes\_NF\Entities\Objects\Weapons\Guns\Projectiles\magic.yml
+# Look for magic bolt here:\Resources\Prototypes\_LostParadise\Entities\Objects\Weapons\Guns\Projectiles\magic.yml
 - type: entity
   name: blood cult zealot
   parent:

diff --git a/Resources/Prototypes/_LostParadise/Entities/Mobs/NPCs/mob_hostile_mercenaries.yml b/Resources/Prototypes/_LostParadise/Entities/Mobs/NPCs/mob_hostile_mercenaries.yml
@@ -445,7 +445,7 @@
     selectedMode: Burst
     availableModes:
     - Burst
-    soundGunshot: /Audio/Weapons/Guns/Gunshots/rifle3.ogg
+    soundGunshot: /Audio/Weapons/Guns/Gunshots/rifle2.ogg
 
 ## Tier 4 - Boss
 - type: entity

diff --git a/Resources/Prototypes/_LostParadise/Roles/Jobs/Hostile/mercenaries.yml b/Resources/Prototypes/_LostParadise/Roles/Jobs/Hostile/mercenaries.yml
@@ -0,0 +1,74 @@
+# Tier 1
+- type: startingGear
+  id: MobHumanoidMercenaryGearMeleeT1
+  equipment:
+    gloves: ClothingHandsGlovesColorMercHatchet
+    pocket1: SpaceCash500
+    pocket2: HydroponicsToolHatchet
+    shoes: ClothingShoesBootsMercenary
+
+- type: startingGear
+  id: MobHumanoidMercenaryGearRangedT1
+  equipment:
+    gloves: ClothingHandsGlovesColorMercPistol
+    back: ClothingBackpackDuffelMecranaryTier1Pistol
+    belt: ClothingBeltWebbingMecranaryTier1Pistol
+    shoes: ClothingShoesBootsMercenary
+
+- type: startingGear
+  id: MobHumanoidMercenaryGearRangedAltT1
+  equipment:
+    gloves: ClothingHandsGlovesColorMercNovalite
+    back: ClothingBackpackDuffelMecranaryTier1Novalite
+    belt: ClothingBeltWebbingMecranaryTier1Novalite
+    shoes: ClothingShoesBootsMercenary
+
+# Tier 2
+- type: startingGear
+  id: MobHumanoidMercenaryGearMeleeT2
+  equipment:
+    gloves: ClothingHandsGlovesColorMercMachete
+    pocket1: Machete
+    pocket2: SpaceCash1000
+    shoes: ClothingShoesBootsCombat
+
+- type: startingGear
+  id: MobHumanoidMercenaryGearRangedT2
+  equipment:
+    gloves: ClothingHandsGlovesColorMercRevolvers
+    back: ClothingBackpackDuffelMecranaryTier2Revolver
+    belt: ClothingBeltWebbingMecranaryTier2Revolver
+    shoes: ClothingShoesBootsCombat
+
+- type: startingGear
+  id: MobHumanoidMercenaryGearRangedAltT2
+  equipment:
+    gloves: ClothingHandsGlovesColorMercShotgun
+    back: ClothingBackpackDuffelMecranaryTier2Shotgun
+    belt: ClothingBeltWebbingMecranaryTier2Shotgun
+    shoes: ClothingShoesBootsCombat
+
+# Tier 3
+- type: startingGear
+  id: MobHumanoidMercenaryGearRangedT3
+  equipment:
+    gloves: ClothingHandsGlovesColorMercLaserNSaw
+    back: ClothingBackpackDuffelMecranaryTier3Medic
+    belt: ClothingBeltMecranaryTier3Medic
+    shoes: ClothingShoesBootsCombat
+
+- type: startingGear
+  id: MobHumanoidMercenaryGearRangedT3Alt
+  equipment:
+    gloves: ClothingHandsGlovesColorMercGestio
+    back: ClothingBackpackDuffelMecranaryTier3Assault
+    belt: ClothingBeltMecranaryTier3Assault
+    shoes: ClothingShoesBootsCombat
+
+# Tier 4
+- type: startingGear
+  id: MobHumanoidMercenaryGearTier4Captain
+  equipment:
+    gloves: ClothingHandsGlovesColorMercRepeater
+    back: ClothingBackpackDuffelMecranaryTier4Captain
+    shoes: ClothingShoesBootsCombat
diff --git a/Resources/Prototypes/_LostParadise/ai_factions.yml b/Resources/Prototypes/_LostParadise/ai_factions.yml
@@ -58,7 +58,37 @@
   # - ArtifactConstruct
   # - StreetGangNF
   # - DinosaursNF
-  # - MercenariesExpeditionNF
+  - MercenariesExpeditionNF
+  # - SiliconsExpeditionNF
+  # - AberrantFleshExpeditionNF
+  # - ContrabandClothing
+  # - ContrabandDetection
+
+  - type: npcFaction
+  id: MercenariesExpeditionNF
+  hostile:
+  ## SS14 factions
+  - NanoTrasen
+  - Syndicate
+  - SimpleHostile
+  - SimpleNeutral
+  - Passive
+  - PetsNT
+  - Zombie
+  - Revolutionary
+  - Xeno
+  # ## Frontier Factions
+  # - Monkey
+  # - Goblin
+  # - SyndicateNF
+  # - WizFedFaction
+  - BloodCultNF
+  # - PirateNF
+  # - ExplorersExpeditionNF
+  # - ArtifactConstruct
+  # - StreetGangNF
+  # - DinosaursNF
+  # #- MercenariesExpeditionNF
   # - SiliconsExpeditionNF
   # - AberrantFleshExpeditionNF
   # - ContrabandClothing