rbreslow / zs

Fork of JetBoom's Zombie Survival for the "Hot Dad" Garry's Mod community.
Other
1 stars 1 forks source link

Replace Arsenal Crates with Sigils #13

Closed Galaco closed 4 years ago

Galaco commented 4 years ago

Overview

Sigils can be used as arsenal crates, removed arsenal crates and packs from worth and shop, allow purchase anywhere in Objective maps.

Resolves #6

Demo

Screenshot 2020-09-15 at 14 52 14

Notes

I didn't increase the distance you have to be from the sigil to buy; it uses the same arsenal crate value, which requires close proximity to the sigil.

Arsenal crates/packs are still supported b/c legacy, but have been removed from worth and shop menus.

Testing Instructions

Checklist

Galaco commented 4 years ago

Nice job. I'm going crazy trying to think of any other edge case that this could effect, but I think we're OK.

If you want, you could also update cl_targetid.lua.

diff --git a/src/garrysmod/gamemodes/zombiesurvival/gamemode/cl_targetid.lua b/src/garrysmod/gamemodes/zombiesurvival/gamemode/cl_targetid.lua
index 3d468c1..255068e 100644
--- a/src/garrysmod/gamemodes/zombiesurvival/gamemode/cl_targetid.lua
+++ b/src/garrysmod/gamemodes/zombiesurvival/gamemode/cl_targetid.lua
@@ -106,9 +106,11 @@ function GM:DrawSigilTargetHint(ent, fade)
        util.ColorCopy(color_white, colTemp)

        draw.SimpleTextBlur("Sigil", "ZSHUDFontSmaller", x, y, colTemp, TEXT_ALIGN_CENTER)
-       y = y + draw.GetFontHeight("ZSHUDFontSmaller") + 0
+       local fontHeight = draw.GetFontHeight("ZSHUDFontSmaller")
+       y = y + fontHeight + 0

        draw.SimpleTextBlur("Press E to teleport", "ZSHUDFontTiny", x, y, colTemp, TEXT_ALIGN_CENTER)
+       draw.SimpleTextBlur(translate.Get("press_f2_for_the_points_shop"), "ZSHUDFontTiny", x, y + fontHeight / 2, colTemp, TEXT_ALIGN_CENTER)
 end

 GM.TraceTarget = NULL

Also, same comment on my last PR, I'd update your PR body so that it resolves the current issue.

This is a good idea; I'd rather add this here if I can, than come back to it later. Will hold off merging for now.

EDIT: This is actually great, I lost count of how often I saw new players asking how to buy items; this will add a huge amount of visibility on how to buy items.

Galaco commented 4 years ago

Nice job!

You may merge at your discretion, but please consider my comments first. Also, I realize the PR template used the Connects keyword, but you have to update it to Fixes, Resolves, or Closes in order for this PR to close out the associated issue.

Corrected formatting issues.

While I believe your point regarding text inconsistency is valid, I do feel that its out of scope of this issue, but is potentially indicative of a separate task involving a more general review of the language used

rbreslow commented 4 years ago

While I believe your point regarding text inconsistency is valid, I do feel that its out of scope of this issue, but is potentially indicative of a separate task involving a more general review of the language used

Good point. I agree.