фиксы

Corvax-Frontier · Jul 13, 2024 · 925d090 · 925d090
2 parents 36af569 + 7c19bf8
commit 925d090
Show file tree

Hide file tree

Showing 94 changed files with 3,761 additions and 47 deletions.
diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
@@ -5657,3 +5657,9 @@ Entries:
       message: Added the SBB Hammer, a medium-sized engineering shuttle.
   id: 5115
   time: '2024-07-13T18:18:47.0000000+00:00'
+- author: ErhardSteinhauer
+  changes:
+    - type: Add
+      message: '@mrscratch added Novalite C1 rifle chambered in .20 round.'
+  id: 5116
+  time: '2024-07-13T21:00:10.0000000+00:00'
diff --git a/Resources/Locale/en-US/_NF/guidebook/guides.ftl b/Resources/Locale/en-US/_NF/guidebook/guides.ftl
@@ -22,6 +22,7 @@ guide-entry-expedition-xenos = Xenos
 
 # Shipyard entries
 guide-entry-shipyard-ambition = Ambition
+guide-entry-shipyard-apothecary = Apothecary
 guide-entry-shipyard-bazaar = Bazaar
 guide-entry-shipyard-bocadillo = Bocadillo
 guide-entry-shipyard-bookworm = Bookworm

diff --git a/Resources/Maps/_NF/Shuttles/apothecary.yml b/Resources/Maps/_NF/Shuttles/apothecary.yml
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/ammo.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/ammo.yml
@@ -6,6 +6,8 @@
     WeaponSniperMosin: 10
     WeaponSniperRepeater: 10
     WeaponSubMachineGunVector45: 3 #FrontierCorvax
+    WeaponRifleGestio: 10
+    WeaponRifleNovaliteC1: 5
     MagazineBoxLightRifle: 10
     MagazineBoxLightRiflePractice: 10
     MagazineVector45: 5 #FrontierCorvax
@@ -18,11 +20,11 @@
     BoxShotgunSlug: 10
     BoxLethalshot: 10
     BoxBeanbag: 10
-    BoxShotgunPractice: 10
     MagazineBoxRifle: 10
     MagazineBoxRifleRubber: 15
     MagazineBoxMagnum: 10
-    SpeedLoaderRifleHeavy: 10
-    SpeedLoaderRifleHeavyRubber: 10
+    SpeedLoaderRifleHeavyEmpty: 10
+    MagazineNovaliteC1Empty: 10
+    MagazineRifleLowCapacityEmpty: 10
   emaggedInventory:
     WeaponPistolViper: 1
diff --git a/Resources/Prototypes/Procedural/salvage_factions.yml b/Resources/Prototypes/Procedural/salvage_factions.yml
@@ -323,7 +323,7 @@
       amount: 1
     prob: 0.1
   - entries:
-    - id: MobMercenarySoldierMosin
+    - id: MobMercenarySoldierNovalite
       amount: 2
       maxAmount: 4
     prob: 0.05

diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/npc_loot_mercenaries.yml b/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/npc_loot_mercenaries.yml
@@ -97,7 +97,7 @@
 
 - type: entity
   parent: MercenaryDuffelGiftBox
-  id: ClothingBackpackDuffelMecranaryTier1Mosin
+  id: ClothingBackpackDuffelMecranaryTier1Novalite
   noSpawn: true
   components:
   - type: SpawnItemsOnUse
@@ -110,7 +110,7 @@
     - id: SpaceCash500
       prob: 0.45
     # Weapons
-    - id: WeaponSniperMosin
+    - id: WeaponRifleNovaliteC1
       prob: 0.9
     # Armor
     - id: ClothingOuterVestWebMercenary
@@ -137,14 +137,20 @@
 
 - type: entity
   parent: MercenaryWebbingBox
-  id: ClothingBeltWebbingMecranaryTier1Mosin
+  id: ClothingBeltWebbingMecranaryTier1Novalite
   noSpawn: true
   components:
   - type: SpawnItemsOnUse
     items:
-    - id: MagazineBoxLightRifle
+    - id: MagazineBoxRifle
+      prob: 0.9
+    - id: MagazineNovaliteC1Empty
+      prob: 0.9
+    - id: MagazineNovaliteC1Empty
       prob: 0.9
-    - id: MagazineBoxLightRifleBig
+    - id: MagazineNovaliteC1
+      prob: 0.2
+    - id: MagazineBoxRifleBig
       prob: 0.2
     sound:
       path: /Audio/Items/jumpsuit_equip.ogg

diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Items/weapon_cases_expedition.yml b/Resources/Prototypes/_NF/Catalog/Fills/Items/weapon_cases_expedition.yml
@@ -263,6 +263,19 @@
     - id: MagazineRifleLowCapacity
       amount: 3
 
+- type: entity
+  parent: WeaponCaseLong
+  id: WeaponCaseLongWeaponRifleNovaliteC1Expedition
+  suffix: Dungeon, NovaliteC1
+  noSpawn: true
+  components:
+  - type: StorageFill
+    contents:
+    - id: WeaponRifleNovaliteC1Expedition
+      amount: 1
+    - id: MagazineNovaliteC1
+      amount: 2
+
 - type: entity
   parent: WeaponCaseLong
   id: WeaponCaseLongLecterExpedition

diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/lesslethalvend.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/lesslethalvend.yml
@@ -2,7 +2,7 @@
   id: LessLethalVendInventory
   startingInventory:
     WeaponDisabler: 10
-    Kardashev-MosinNonlethal: 10
+#    Kardashev-MosinNonlethal: 10
     WeaponRevolverArgentiNonlethal: 10
     WeaponShotgunDoubleBarreledRubber: 10
     WeaponFlareGun: 20

diff --git a/Resources/Prototypes/_NF/Catalog/security_uplink_catalog.yml b/Resources/Prototypes/_NF/Catalog/security_uplink_catalog.yml
@@ -229,7 +229,7 @@
   name:  uplink-security-emitter-name
   description: uplink-security-emitter-desc
   productEntity: WeaponEmpEmitter
-  icon: { sprite: _NF/Objects/Weapons/EMP-Gun.rsi, state: icon }
+  icon: { sprite: _NF/Objects/Weapons/Guns/Projectiles/emp.rsi, state: icon }
   cost:
     FrontierUplinkCoin: 1
   categories:

diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Hands/gloves_mob_hostile_npcs.yml b/Resources/Prototypes/_NF/Entities/Clothing/Hands/gloves_mob_hostile_npcs.yml
@@ -162,6 +162,21 @@
       - sprite: _NF/Objects/Weapons/Gestio-Rifle.rsi
         state: wielded-inhand-right
 
+- type: entity
+  parent: ClothingHandsGlovesColorBlackSMG
+  id: ClothingHandsGlovesColorMercNovalite
+  name: combat gloves
+  suffix: novalite
+  noSpawn: true
+  components:
+  - type: Clothing
+    clothingVisuals:
+      gloves:
+      - sprite: Clothing/Hands/Gloves/mercbattle.rsi
+        state: equipped-HAND
+      - sprite: _NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi
+        state: wielded-inhand-right
+
 - type: entity
   parent: ClothingHandsGlovesColorBlackSMG
   id: ClothingHandsGlovesColorMercHatchet

diff --git a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_weapons.yml b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_weapons.yml
@@ -179,6 +179,7 @@
     - WeaponCaseShortDeckardExpedition
     - WeaponCaseShortPython
     - WeaponCaseLongGestioExpedition
+    - WeaponCaseLongWeaponRifleNovaliteC1Expedition
     - WeaponCaseLongKammererExpedition
     - WeaponCaseLongEnergyGunExpedition
     - WeaponCaseLongRepeaterExpedition

diff --git a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/mobs_hostile_mercenaries.yml b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/mobs_hostile_mercenaries.yml
@@ -29,7 +29,7 @@
     prototypes:
     - MobMercenarySoldierKnife
     - MobMercenarySoldierPistol
-    - MobMercenarySoldierMosin
+    - MobMercenarySoldierNovalite
     chance: 1
     offset: 0.0
     rarePrototypes:

diff --git a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_mercenaries.yml b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_mercenaries.yml
@@ -151,7 +151,7 @@
 - type: entity
   name: mercenary soldier
   parent: MobMercenaryBase
-  id: MobMercenarySoldierMosin
+  id: MobMercenarySoldierNovalite # No mosin: novalite rifle now
   description: Low-ranking soldiers armed with a variety of surplus weapons.
   noSpawn: true
   components:
@@ -179,18 +179,18 @@
       color: "#a9b6bd"
       shader: unshaded
   - type: BasicEntityAmmoProvider
-    proto: CartridgeLightRifle
+    proto: CartridgeRifle
     capacity: 10
     count: 10
   - type: Gun
     showExamineText: false
-    fireRate: 0.65
+    fireRate: 0.85
     minAngle: 1
     maxAngle: 10
     selectedMode: SemiAuto
     availableModes:
     - SemiAuto
-    soundGunshot: /Audio/Weapons/Guns/Gunshots/sniper.ogg
+    soundGunshot: /Audio/Weapons/Guns/Gunshots/ltrifle.ogg
 
 ## Tier 2
 - type: entity

diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml
@@ -24,7 +24,7 @@
     proto: CartridgeLightRifle
     capacity: 10
   - type: Sprite
-    sprite: _NF/Objects/Weapons/Ammunition/svt40.rsi
+    sprite: _NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/svt40.rsi
 
 - type: entity
   id: 10roundmagazineempty
@@ -49,19 +49,19 @@
     - state: mag-1
       map: ["enum.GunVisualLayers.Mag"]
 
-# type: entity  to be added back when Rubber rounds are added. 
- # id: 10roundmagazineRubber
-  #name: "10 round magazine(.30 rifle rubber)"
-  #parent: 10roundmagazine
-  #components:
-  # type: BallisticAmmoProvider
-  # proto: CartridgeLightRifleRubber
-  #type: Sprite
-   #layers:
-    # state: rubber
-     #map: ["enum.GunVisualLayers.Base"]
-    #state: mag-1
-    #map: ["enum.GunVisualLayers.Mag"]
+- type: entity
+  id: 10roundmagazineRubber
+  name: "10 round magazine(.30 rifle rubber)"
+  parent: 10roundmagazine
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgeLightRifleRubber
+  - type: Sprite
+    layers:
+    - state: rubber
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]
 
 - type: entity
   id: 10roundmagazinePractice
@@ -85,4 +85,4 @@
   - type: BallisticAmmoProvider
     proto: CartridgeLightRifleIncendiary
   - type: Sprite
-    sprite: _NF/Objects/Weapons/Ammunition/svt40.rsi
+    sprite: _NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/svt40.rsi
diff --git a/...rces/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Magazines/novalitec1clip.yml b/...rces/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Magazines/novalitec1clip.yml
@@ -0,0 +1,48 @@
+# Empty mags
+- type: entity
+  parent: BaseMagazineRifle
+  id: MagazineNovaliteC1Empty
+  name: "clip (.20 rifle any)"
+  suffix: empty
+  components:
+  - type: Tag
+    tags:
+      - MagazineNovaliteC1
+  - type: Item
+    size: Small
+  - type: BallisticAmmoProvider
+    mayTransfer: true
+    whitelist:
+      tags:
+        - CartridgeRifle
+    capacity: 15
+  - type: ContainerContainer
+    containers:
+      ballistic-ammo: !type:Container
+  - type: Sprite
+    sprite: _NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]
+  - type: MagazineVisuals
+    magState: mag
+    steps: 16
+    zeroVisible: false
+  - type: Appearance
+
+- type: entity
+  parent: MagazineNovaliteC1Empty
+  id: MagazineNovaliteC1
+  name: "clip (.20 rifle)"
+  suffix: full
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgeRifle
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]
diff --git a/...uns/Ammunition/Magazines/rifle_lowcap.yml → ...s/Guns/Ammunition/Magazines/rifle_low.yml b/...uns/Ammunition/Magazines/rifle_lowcap.yml → ...s/Guns/Ammunition/Magazines/rifle_low.yml
@@ -1,6 +1,23 @@
+- type: entity
+  id: MagazineRifleLowCapacityEmpty
+  name: "low cap magazine (.20 rifle any)"
+  suffix: empty
+  parent: MagazineRifle
+  components:
+  - type: BallisticAmmoProvider
+    proto: null
+    capacity: 15
+  - type: Item
+    size: Tiny
+  - type: Sprite
+    sprite: _NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_cap_mag.rsi
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+
 - type: entity
   id: MagazineRifleLowCapacity
-  name: "magazine Low-Cap (.20 rifle)"
+  name: "low cap magazine (.20 rifle)"
   parent: BaseMagazineRifle
   components:
   - type: BallisticAmmoProvider
@@ -9,7 +26,7 @@
   - type: Item
     size: Tiny
   - type: Sprite
-    sprite: _NF/Objects/Weapons/Low-Cap-Rifle-Magazine.rsi
+    sprite: _NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_cap_mag.rsi
     layers:
     - state: red
       map: ["enum.GunVisualLayers.Base"]
@@ -18,7 +35,7 @@
 
 - type: entity
   id: MagazineRifleLowCapacityPractice
-  name: "magazine Low-Cap (.20 rifle practice)"
+  name: "low cap magazine (.20 rifle practice)"
   parent: MagazineRifleLowCapacity
   components:
   - type: BallisticAmmoProvider
@@ -35,7 +52,7 @@
 
 - type: entity
   id: MagazineRifleLowCapacityRubber
-  name: "magazine Low-Cap (.20 rifle rubber)"
+  name: "low cap magazine (.20 rifle rubber)"
   parent: MagazineRifleLowCapacity
   components:
   - type: BallisticAmmoProvider
@@ -52,7 +69,7 @@
 
 - type: entity
   id: MagazineRifleLowCapacityUranium
-  name: "magazine Low-Cap (.20 rifle uranium)"
+  name: "low cap magazine (.20 rifle uranium)"
   parent: MagazineRifleLowCapacity
   components:
   - type: BallisticAmmoProvider

diff --git a/...rces/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/heavy_rifle.yml b/...rces/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/heavy_rifle.yml
@@ -49,6 +49,9 @@
   components:
   - type: BallisticAmmoProvider
     proto: null
+  - type: Icon
+    sprite: _NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi
+    state: base
   - type: Sprite
     sprite: _NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi
     layers:

diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
@@ -5,15 +5,15 @@
   description: Releases electromagnetic pulses that disrupt or damage many electronic devices or drain power cells, has a slow self charging nuclear powered battery.
   components:
   - type: Sprite
-    sprite: _NF/Objects/Weapons/EMP-Gun.rsi
+    sprite: _NF/Objects/Weapons/Guns/Projectiles/emp.rsi
     layers:
     - state: base
       map: ["enum.GunVisualLayers.Base"]
     - state: mag-unshaded-0
       map: ["enum.GunVisualLayers.MagUnshaded"]
       shader: unshaded
   - type: Clothing
-    sprite: _NF/Objects/Weapons/EMP-Gun.rsi
+    sprite: _NF/Objects/Weapons/Guns/Projectiles/emp.rsi
   - type: Gun
     fireRate: 1
     selectedMode: SemiAuto