Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Mail Buff #1473

Merged
merged 8 commits into from
Jun 7, 2024
Merged
Show file tree
Hide file tree
Changes from 7 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ public sealed partial class MailComponent : SharedMailComponent
/// The amount that cargo will be awarded for delivering this mail.
/// </summary>
[DataField("bounty")]
public int Bounty = 750;
public int Bounty = 7500; // Frontier 750<7500

/// <summary>
/// Penalty if the mail is destroyed.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ public sealed partial class MailTeleporterComponent : Component

// Not starting accumulator at 0 so mail carriers have some deliveries to make shortly after roundstart.
[DataField("accumulator")]
public float Accumulator = 285f;
public float Accumulator = 1995f; // Frontier 285*7=1995

[DataField("teleportInterval")]
public TimeSpan TeleportInterval = TimeSpan.FromMinutes(5);
public TimeSpan TeleportInterval = TimeSpan.FromMinutes(35);

/// <summary>
/// The sound that's played when new mail arrives.
Expand Down Expand Up @@ -72,7 +72,7 @@ public sealed partial class MailTeleporterComponent : Component
/// What's the bonus for delivering a fragile package intact?
/// </summary>
[DataField("fragileBonus")]
public int FragileBonus = 200;
public int FragileBonus = 2000; // Frontier 200<2000

/// <summary>
/// What's the malus for failing to deliver a fragile package?
Expand All @@ -91,13 +91,13 @@ public sealed partial class MailTeleporterComponent : Component
/// if not delivered?
/// </summary>
[DataField("priorityDuration")]
public TimeSpan priorityDuration = TimeSpan.FromMinutes(15);
public TimeSpan priorityDuration = TimeSpan.FromMinutes(45); // Frontier 15<45

/// <summary>
/// What's the bonus for delivering a priority package on time?
/// </summary>
[DataField("priorityBonus")]
public int PriorityBonus = 500;
public int PriorityBonus = 5000; // Frontier 500<5000

/// <summary>
/// What's the malus for failing to deliver a priority package?
Expand Down
4 changes: 2 additions & 2 deletions Content.Server/Nyanotrasen/Mail/MailSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -230,8 +230,8 @@ private void OnAfterInteractUsing(EntityUid uid, MailComponent component, AfterI
return;
}

//_popupSystem.PopupEntity(Loc.GetString("mail-unlocked-reward", ("bounty", component.Bounty)), uid, args.User);
_popupSystem.PopupEntity(Loc.GetString("mail-unlocked-reward"), uid, args.User); // Frontier - Remove the mention of station income
_popupSystem.PopupEntity(Loc.GetString("mail-unlocked-reward", ("bounty", component.Bounty)), uid, args.User);
//_popupSystem.PopupEntity(Loc.GetString("mail-unlocked-reward"), uid, args.User); // Frontier - Remove the mention of station income

component.IsProfitable = false;

Expand Down
2 changes: 1 addition & 1 deletion Resources/Locale/en-US/nyanotrasen/mail.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ mail-desc-priority = The anti-tamper lock's [color=yellow]yellow priority tape[/
mail-desc-priority-inactive = The anti-tamper lock's [color=#886600]yellow priority tape[/color] is inactive.
mail-unlocked = Anti-tamper system unlocked.
mail-unlocked-by-emag = Anti-tamper system *BZZT*.
mail-unlocked-reward = Anti-tamper system unlocked.
mail-unlocked-reward = Anti-tamper system unlocked. {$bounty} spesos have been added to Frontier account.
mail-penalty-lock = ANTI-TAMPER LOCK BROKEN. STATION BANK ACCOUNT PENALIZED BY {$credits} SPESOS.
mail-penalty-fragile = INTEGRITY COMPROMISED. STATION BANK ACCOUNT PENALIZED BY {$credits} SPESOS.
mail-penalty-expired = DELIVERY PAST DUE. STATION BANK ACCOUNT PENALIZED BY {$credits} SPESOS.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
name: mail-item-name-unaddressed
components:
- type: Item
size: Normal
# size: Normal # Frontier
storedRotation: -90
- type: Mail
- type: AccessReader
- type: Sprite
Expand All @@ -19,7 +20,7 @@
map: ["enum.MailVisualLayers.FragileStamp"]
visible: false
- map: ["enum.MailVisualLayers.JobStamp"]
scale: 0.5, 0.5
scale: 0.8, 0.8 # Frontier 0.5<0.8
offset: 0.275, 0.2
dvir001 marked this conversation as resolved.
Show resolved Hide resolved
- state: locked
map: ["enum.MailVisualLayers.Lock"]
Expand Down Expand Up @@ -92,7 +93,7 @@
damage:
types:
Blunt: 10
- type: CargoSellBlacklist
- type: CargoSellBlacklist # Frontier
- type: Food # Frontier - Moth food
requiresSpecialDigestion: true
- type: SolutionContainerManager
Expand Down
Loading