Jelajahi Sumber

Tdm update 4 (#208)

* smgs

* ARs and SMGs

* mag sprites

* areas get occupied by the largest team present

* duplicates

* fire modes

* caliber fixes, smg > ar

* duplicates removed, added gun stats to SMGs

* ar stats

* ar tweaks

* pistols

* yaml fixes, more mags

* Sync (#205)

* Nomads update 1 (#202)

* removes old ambient sounds

* yaml fixes

* stamina

* maybe fixes invites? needs testing

* linter error quickfix

* another quickfix

* cmon work

* Ww2 (#204)

* Update base_clothing.yml again

* Lowered base_item.yml to 100g

* yay

* Update soviet.yml

dupe

* Update german.yml

* Update german.yml

* Update soviet.yml

* Update soviet.yml

* stahlhelm

* Update soviet.yml

* Tweaked a bit wooden club

* Update Resources/Locale/en-US/Civ14/jobs-descriptions.ftl

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* Update Resources/Locale/en-US/Civ14/jobs-descriptions.ftl

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* Update entities_clothing_hats.yml

* Update jobs.ftl

* Update faction.yml

* Update entities_clothing_hats.yml

---------

Co-authored-by: 123 <123>
Co-authored-by: Taislin <taislin@civ13.com>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

---------

Co-authored-by: Papiditel <mrharved@gmail.com>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* quickequip, ww2 loadouts

* coderabbit suggestions

* even more guns!

* new mgs, nades, webbings

* small fixes

* typo

* test stuff

* mg webbings

* fixing mgs?

---------

Co-authored-by: Papiditel <mrharved@gmail.com>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
Taislin 6 bulan lalu
induk
melakukan
985127e1a2

+ 1 - 1
Resources/ConfigPresets/Build/development.toml

@@ -2,7 +2,7 @@
 # Straight in-game baby
 lobbyenabled = true
 # Dev map for faster loading & convenience
-map = "Opushka"
+map = "CampWW2"
 role_timers = false
 lobbyduration = 15
 disallowlatejoins = false

+ 2 - 2
Resources/Prototypes/Civ14/Entities/Clothing/webbings.yml

@@ -78,7 +78,7 @@
     - type: StorageFill
       contents:
         - id: civ13_magazine_clip_(7.92x57mm)
-          amount: 8
+          amount: 5
         - id: GrenadeSHG24
           amount: 2
 
@@ -91,7 +91,7 @@
     - type: StorageFill
       contents:
         - id: civ13_magazine_clip_(7.62x54mm)
-          amount: 8
+          amount: 5
         - id: GrenadeF1
           amount: 2
 

+ 3 - 1
Resources/Prototypes/Civ14/Entities/Objects/Guns/entities_mg.yml

@@ -37,12 +37,15 @@
     - type: ItemSlots
       slots:
         gun_magazine:
+          name: Magazine
+          priority: 3
           startingItem: civ13_magazine_PKM_ammo_belt_(7.62x54mmR)
           whitelistFailPopup: gun-magazine-whitelist-fail
           whitelist:
             tags:
               - civ13_magazine_PKM_ammo_belt_(7.62x54mmR)
         gun_chamber:
+          name: Chamber
           startingItem: civ13_caliber_a762x54
           priority: 1
           whitelist:
@@ -68,7 +71,6 @@
       slots:
         gun_magazine:
           startingItem: civ13_magazine_PKM_ammo_belt_(7.62x54mmR)
-          priority: 2
           whitelist:
             tags:
               - civ13_magazine_PKM_ammo_belt_(7.62x54mmR)

+ 2 - 3
Resources/Prototypes/Maps/civ/camp_ww2.yml

@@ -7,7 +7,7 @@
   maxRandomOffset: 0
   randomRotation: false
   stations:
-    Opushka:
+    CampWW2:
       stationProto: StandardStationTDM
       components:
         - type: StationNameSetup
@@ -21,8 +21,7 @@
             GermanRifleman: [20, 50]
             GermanMachinegunner: [5, 20]
             GermanMedic: [1, 3]
-
-          # Soviet
+            # Soviet
             SovietCaptain: [1, 1]
             SovietSergeant: [2, 5]
             SovietSubmachineGunner: [5, 20]