Фиксы (#462)

* Fix crafting steel tiles requiring silk (#19071) * No gift uplinks * Cargo hunter balance * More prices * Fix tests * Price fixes * Map fix * No payment in lobby * Fix cloth recipe * Less money --------- Co-authored-by: PixelTK <85175107+PixelTheKermit@users.noreply.github.com>
2023-10-03 12:16:19 +09:00
parent dff51b930b
commit 04f0c69b5a
17 changed files with 48 additions and 13 deletions
--- a/Content.Server/White/Economy/BankCardSystem.cs
+++ b/Content.Server/White/Economy/BankCardSystem.cs
@@ -33,6 +33,7 @@ public sealed class BankCardSystem : EntitySystem
    [Dependency] private readonly InventorySystem _inventorySystem = default!;
    [Dependency] private readonly BankCartridgeSystem _bankCartridge = default!;
    [Dependency] private readonly JobSystem _job = default!;
+    [Dependency] private readonly GameTicker _gameTicker = default!;

    private const int SalaryDelay = 1200;

@@ -53,6 +54,12 @@ public sealed class BankCardSystem : EntitySystem
    {
        base.Update(frameTime);

+        if (_gameTicker.RunLevel != GameRunLevel.InRound)
+        {
+            _salaryTimer = 0f;
+            return;
+        }
+
        _salaryTimer += frameTime;

        if (_salaryTimer <= SalaryDelay)
@@ -121,7 +128,7 @@ public sealed class BankCardSystem : EntitySystem
            if (!TryComp(mind.Mind, out MindComponent? mindComponent))
                return;

-            bankAccount.Balance = GetSalary(mind.Mind) * 3;
+            bankAccount.Balance = GetSalary(mind.Mind) + 100;
            mindComponent.AddMemory(new Memory("PIN", bankAccount.AccountPin.ToString()));
            bankAccount.Mind = (mind.Mind.Value, mindComponent);
            bankAccount.Name = Name(ev.Mob);
--- a/Resources/Locale/ru-RU/white/economy/cards.ftl
+++ b/Resources/Locale/ru-RU/white/economy/cards.ftl
@@ -27,6 +27,7 @@ ent-SecurityBudgetCard = Ведомственная карточка (Оборо
    .suffix = { "" }

 ent-CommandBudgetPinPaper = PIN-код станционного бюджета.
+    .desc = Листок белой бумаги
    .suffix = { "" }

 command-budget-pin-message = PIN-код станционного бюджета: { $pin }
--- a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml
@@ -12,7 +12,7 @@
    sprite: Objects/Specific/Service/vending_machine_restock.rsi
    state: base
  product: CrateVendingMachineRestockBoozeFilled
-  cost: 3500
+  cost: 5000
  category: Service
  group: market

@@ -84,7 +84,7 @@
    sprite: Objects/Specific/Service/vending_machine_restock.rsi
    state: base
  product: CrateVendingMachineRestockHotDrinksFilled
-  cost: 1200
+  cost: 1500
  category: Service
  group: market

@@ -134,7 +134,7 @@
    sprite: Objects/Specific/Service/vending_machine_restock.rsi
    state: base
  product: CrateVendingMachineRestockRobustSoftdrinksFilled
-  cost: 1200
+  cost: 2000
  category: Service
  group: market

@@ -174,7 +174,7 @@
    sprite: Objects/Specific/Service/vending_machine_restock.rsi
    state: base
  product: CrateVendingMachineRestockSmokesFilled
-  cost: 1200
+  cost: 1500
  category: Service
  group: market

@@ -224,7 +224,7 @@
    sprite: Objects/Specific/Service/vending_machine_restock.rsi
    state: base
  product: CrateVendingMachineRestockGetmoreChocolateCorpFilled
-  cost: 1200
+  cost: 2000
  category: Service
  group: market

@@ -234,7 +234,7 @@
    sprite: Objects/Specific/Service/vending_machine_restock.rsi
    state: base
  product: CrateVendingMachineRestockChangFilled
-  cost: 1200
+  cost: 2000
  category: Service
  group: market

@@ -244,7 +244,7 @@
    sprite: Objects/Specific/Service/vending_machine_restock.rsi
    state: base
  product: CrateVendingMachineRestockDiscountDansFilled
-  cost: 1200
+  cost: 2000
  category: Service
  group: market

@@ -254,6 +254,6 @@
    sprite: Objects/Specific/Service/vending_machine_restock.rsi
    state: base
  product: CrateVendingMachineRestockDonutFilled
-  cost: 1200
+  cost: 2000
  category: Service
  group: market
--- a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml
+++ b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml
@@ -30,6 +30,8 @@
    delay: 0.5
  - type: ExplosionResistance
    damageCoefficient: 0.9
+  - type: StaticPrice
+    price: 40

 - type: entity
  parent: ClothingBackpack
--- a/Resources/Prototypes/Entities/Clothing/Back/duffel.yml
+++ b/Resources/Prototypes/Entities/Clothing/Back/duffel.yml
@@ -14,6 +14,8 @@
    walkModifier: 1
    sprintModifier: 0.9
  - type: HeldSpeedModifier
+  - type: StaticPrice
+    price: 40

 - type: entity
  parent: ClothingBackpackDuffel
--- a/Resources/Prototypes/Entities/Clothing/Belt/base_clothingbelt.yml
+++ b/Resources/Prototypes/Entities/Clothing/Belt/base_clothingbelt.yml
@@ -14,7 +14,7 @@
    materialComposition:
      Cloth: 50
  - type: StaticPrice
-    price: 25
+    price: 30

 - type: entity
  abstract: true
--- a/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml
@@ -25,6 +25,8 @@
      - ClothMade
      - DroneUsable
      - WhitelistChameleon
+  - type: StaticPrice
+    price: 25

 - type: entity
  abstract: true
--- a/Resources/Prototypes/Entities/Clothing/Neck/base_clothingneck.yml
+++ b/Resources/Prototypes/Entities/Clothing/Neck/base_clothingneck.yml
@@ -29,3 +29,5 @@
    tags:
    - ClothMade
    - WhitelistChameleon
+  - type: StaticPrice
+    price: 25
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml
@@ -8,6 +8,8 @@
    - outerClothing
  - type: Sprite
    state: icon
+  - type: StaticPrice
+    price: 40

 - type: entity
  abstract: true
@@ -51,8 +53,6 @@
    interfaces:
    - key: enum.StorageUiKey.Key
      type: StorageBoundUserInterface
-  - type: StaticPrice
-    price: 20
  # WD edit sounds start
  - type: EmitSoundOnPickup
    sound:
--- a/Resources/Prototypes/Entities/Clothing/Shoes/base_clothingshoes.yml
+++ b/Resources/Prototypes/Entities/Clothing/Shoes/base_clothingshoes.yml
@@ -23,6 +23,8 @@
    tags:
    - ClothMade
    - WhitelistChameleon
+  - type: StaticPrice
+    price: 25

 - type: entity
  abstract: true
--- a/Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml
+++ b/Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml
@@ -27,6 +27,8 @@
    tags:
    - ClothMade
    - WhitelistChameleon
+  - type: StaticPrice
+    price: 30
  # WD edit sounds start
  - type: EmitSoundOnPickup
    sound:
--- a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/rolling_paper.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/rolling_paper.yml
@@ -20,6 +20,8 @@
    state: cigpapers
  - type: Item
    sprite: Objects/Consumable/Smokeables/Cigarettes/paper.rsi
+  - type: StaticPrice
+    price: 5

 - type: entity
  parent: PackPaperRolling
@@ -38,6 +40,8 @@
        amount: 2
      - id: CigaretteFilter
        amount: 2
+  - type: StaticPrice
+    price: 5

 - type: entity
  id: PaperRolling
--- a/Resources/Prototypes/Entities/Objects/Materials/materials.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/materials.yml
@@ -154,6 +154,9 @@
    state: cloth
  - type: Stack
    count: 1
+  - type: Construction
+    graph: WebObjects
+    node: cloth

 - type: entity
  parent: MaterialBase
--- a/Resources/Prototypes/Entities/Objects/Misc/implanters.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/implanters.yml
@@ -179,6 +179,7 @@
  components:
  - type: Implanter
    implant: UplinkImplant
+  - type: GiftIgnore

 - type: entity
  id: EmpImplanter
--- a/Resources/Prototypes/Entities/Objects/Specific/syndicate.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/syndicate.yml
@@ -71,6 +71,7 @@
    preset: StorePresetUplink
    balance:
      Telecrystal: 0
+  - type: GiftIgnore

 - type: entity
  parent: BaseUplinkRadio
@@ -81,6 +82,7 @@
    preset: StorePresetUplink
    balance:
      Telecrystal: 20
+  - type: GiftIgnore

 - type: entity
  parent: BaseUplinkRadio
@@ -91,6 +93,7 @@
    preset: StorePresetUplink
    balance:
      Telecrystal: 25
+  - type: GiftIgnore

 #this uplink MUST be used for nukeops, as it has the tag for filtering the listing.
 - type: entity
@@ -105,6 +108,7 @@
  - type: Tag
    tags:
    - NukeOpsUplink
+  - type: GiftIgnore

 - type: entity
  parent: BaseUplinkRadio
--- a/Resources/Prototypes/Entities/Objects/Tools/matches.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/matches.yml
@@ -113,3 +113,5 @@
    tags:
    - Trash
  - type: SpaceGarbage
+  - type: StaticPrice
+    price: 5
--- a/Resources/Prototypes/White/Economy/salary.yml
+++ b/Resources/Prototypes/White/Economy/salary.yml
@@ -11,6 +11,7 @@
    Quartermaster: 600
    CargoTechnician: 200
    SalvageSpecialist: 300
+    SeniorSalvageSpecialist: 400
    Bartender: 200
    Botanist: 200
    Boxer: 150