added mk2 tints to es_extended#754
Closed
PreacherDev wants to merge 2 commits into
Closed
Conversation
didn't test it with this version. may work
added translation for mk2 tints
Contributor
|
Has to be a better way to do that, its must be working. But nothing else |
Contributor
first of all why this is a bad way to do it? |
Author
|
it basically just uses other table keys. when mk2 then choose mk2 key |
Contributor
|
How about you just make a different table for it, instead of writing in the same |
Author
|
the one who writing on this script could've implemented it long time ago. |
Contributor
Still for backwards compatibility (eg scripts relying on the old table), you should make a new table and call it like MK2WeaponTints |
Author
|
that is definitely a good idea yes. they could do it if its not done on the latest version, many people would like to have it |
Gellipapa
reviewed
Jan 9, 2023
Contributor
There was a problem hiding this comment.
@PreacherDev Hi! Yes I also think that a separate board would be the solution. If you update the es_textend it will work as it is, there should be no restrictions! If you doing these changes please update your branch and fix merge issues thank you.
iSentrie
suggested changes
Jan 10, 2023
Comment on lines
+2
to
+48
| ['non_mk2'] = { | ||
| -- DEFAULT | ||
| [0] = TranslateCap('tint_default'), | ||
| [1] = TranslateCap('tint_green'), | ||
| [2] = TranslateCap('tint_gold'), | ||
| [3] = TranslateCap('tint_pink'), | ||
| [4] = TranslateCap('tint_army'), | ||
| [5] = TranslateCap('tint_lspd'), | ||
| [6] = TranslateCap('tint_orange'), | ||
| [7] = TranslateCap('tint_platinum'), | ||
| }, | ||
| ['mk2'] = { | ||
| -- MK2 | ||
| [0] = TranslateCap('tint_classic_black'), | ||
| [1] = TranslateCap('tint_classic_gray'), | ||
| [2] = TranslateCap('tint_classic_two_tone'), | ||
| [3] = TranslateCap('tint_classic_white'), | ||
| [4] = TranslateCap('tint_classic_beige'), | ||
| [5] = TranslateCap('tint_classic_green'), | ||
| [6] = TranslateCap('tint_classic_blue'), | ||
| [7] = TranslateCap('tint_classic_earth'), | ||
| [8] = TranslateCap('tint_classic_brown_black'), | ||
| [9] = TranslateCap('tint_contrast_red'), | ||
| [10] = TranslateCap('tint_contrast_blue'), | ||
| [11] = TranslateCap('tint_contrast_yellow'), | ||
| [12] = TranslateCap('tint_contrast_orange'), | ||
| [13] = TranslateCap('tint_bold_pink'), | ||
| [14] = TranslateCap('tint_bold_purple_yellow'), | ||
| [15] = TranslateCap('tint_bold_orange'), | ||
| [16] = TranslateCap('tint_bold_green_purple'), | ||
| [17] = TranslateCap('tint_bold_red_feat'), | ||
| [18] = TranslateCap('tint_bold_green_feat'), | ||
| [19] = TranslateCap('tint_bold_cyan_feat'), | ||
| [20] = TranslateCap('tint_bold_yellow_feat'), | ||
| [21] = TranslateCap('tint_bold_red_white'), | ||
| [22] = TranslateCap('tint_bold_blue_white'), | ||
| [23] = TranslateCap('tint_metallic_gold'), | ||
| [24] = TranslateCap('tint_metallic_platinum'), | ||
| [25] = TranslateCap('tint_metallic_gray_lilac'), | ||
| [26] = TranslateCap('tint_metallic_purple_lime'), | ||
| [27] = TranslateCap('tint_metallic_red'), | ||
| [28] = TranslateCap('tint_metallic_green'), | ||
| [29] = TranslateCap('tint_metallic_blue'), | ||
| [30] = TranslateCap('tint_metallic_white_aqua'), | ||
| [31] = TranslateCap('tint_metallic_orange_yellow'), | ||
| [32] = TranslateCap('tint_metallic_red_yellow'), | ||
| }, |
Contributor
There was a problem hiding this comment.
Suggested change
| ['non_mk2'] = { | |
| -- DEFAULT | |
| [0] = TranslateCap('tint_default'), | |
| [1] = TranslateCap('tint_green'), | |
| [2] = TranslateCap('tint_gold'), | |
| [3] = TranslateCap('tint_pink'), | |
| [4] = TranslateCap('tint_army'), | |
| [5] = TranslateCap('tint_lspd'), | |
| [6] = TranslateCap('tint_orange'), | |
| [7] = TranslateCap('tint_platinum'), | |
| }, | |
| ['mk2'] = { | |
| -- MK2 | |
| [0] = TranslateCap('tint_classic_black'), | |
| [1] = TranslateCap('tint_classic_gray'), | |
| [2] = TranslateCap('tint_classic_two_tone'), | |
| [3] = TranslateCap('tint_classic_white'), | |
| [4] = TranslateCap('tint_classic_beige'), | |
| [5] = TranslateCap('tint_classic_green'), | |
| [6] = TranslateCap('tint_classic_blue'), | |
| [7] = TranslateCap('tint_classic_earth'), | |
| [8] = TranslateCap('tint_classic_brown_black'), | |
| [9] = TranslateCap('tint_contrast_red'), | |
| [10] = TranslateCap('tint_contrast_blue'), | |
| [11] = TranslateCap('tint_contrast_yellow'), | |
| [12] = TranslateCap('tint_contrast_orange'), | |
| [13] = TranslateCap('tint_bold_pink'), | |
| [14] = TranslateCap('tint_bold_purple_yellow'), | |
| [15] = TranslateCap('tint_bold_orange'), | |
| [16] = TranslateCap('tint_bold_green_purple'), | |
| [17] = TranslateCap('tint_bold_red_feat'), | |
| [18] = TranslateCap('tint_bold_green_feat'), | |
| [19] = TranslateCap('tint_bold_cyan_feat'), | |
| [20] = TranslateCap('tint_bold_yellow_feat'), | |
| [21] = TranslateCap('tint_bold_red_white'), | |
| [22] = TranslateCap('tint_bold_blue_white'), | |
| [23] = TranslateCap('tint_metallic_gold'), | |
| [24] = TranslateCap('tint_metallic_platinum'), | |
| [25] = TranslateCap('tint_metallic_gray_lilac'), | |
| [26] = TranslateCap('tint_metallic_purple_lime'), | |
| [27] = TranslateCap('tint_metallic_red'), | |
| [28] = TranslateCap('tint_metallic_green'), | |
| [29] = TranslateCap('tint_metallic_blue'), | |
| [30] = TranslateCap('tint_metallic_white_aqua'), | |
| [31] = TranslateCap('tint_metallic_orange_yellow'), | |
| [32] = TranslateCap('tint_metallic_red_yellow'), | |
| }, | |
| [0] = TranslateCap('tint_default'), | |
| [1] = TranslateCap('tint_green'), | |
| [2] = TranslateCap('tint_gold'), | |
| [3] = TranslateCap('tint_pink'), | |
| [4] = TranslateCap('tint_army'), | |
| [5] = TranslateCap('tint_lspd'), | |
| [6] = TranslateCap('tint_orange'), | |
| [7] = TranslateCap('tint_platinum') | |
| } | |
| Config.MK2WeaponTints = { | |
| [0] = TranslateCap('tint_classic_black'), | |
| [1] = TranslateCap('tint_classic_gray'), | |
| [2] = TranslateCap('tint_classic_two_tone'), | |
| [3] = TranslateCap('tint_classic_white'), | |
| [4] = TranslateCap('tint_classic_beige'), | |
| [5] = TranslateCap('tint_classic_green'), | |
| [6] = TranslateCap('tint_classic_blue'), | |
| [7] = TranslateCap('tint_classic_earth'), | |
| [8] = TranslateCap('tint_classic_brown_black'), | |
| [9] = TranslateCap('tint_contrast_red'), | |
| [10] = TranslateCap('tint_contrast_blue'), | |
| [11] = TranslateCap('tint_contrast_yellow'), | |
| [12] = TranslateCap('tint_contrast_orange'), | |
| [13] = TranslateCap('tint_bold_pink'), | |
| [14] = TranslateCap('tint_bold_purple_yellow'), | |
| [15] = TranslateCap('tint_bold_orange'), | |
| [16] = TranslateCap('tint_bold_green_purple'), | |
| [17] = TranslateCap('tint_bold_red_feat'), | |
| [18] = TranslateCap('tint_bold_green_feat'), | |
| [19] = TranslateCap('tint_bold_cyan_feat'), | |
| [20] = TranslateCap('tint_bold_yellow_feat'), | |
| [21] = TranslateCap('tint_bold_red_white'), | |
| [22] = TranslateCap('tint_bold_blue_white'), | |
| [23] = TranslateCap('tint_metallic_gold'), | |
| [24] = TranslateCap('tint_metallic_platinum'), | |
| [25] = TranslateCap('tint_metallic_gray_lilac'), | |
| [26] = TranslateCap('tint_metallic_purple_lime'), | |
| [27] = TranslateCap('tint_metallic_red'), | |
| [28] = TranslateCap('tint_metallic_green'), | |
| [29] = TranslateCap('tint_metallic_blue'), | |
| [30] = TranslateCap('tint_metallic_white_aqua'), | |
| [31] = TranslateCap('tint_metallic_orange_yellow'), | |
| [32] = TranslateCap('tint_metallic_red_yellow') |
| label = TranslateCap('weapon_appistol'), | ||
| ammo = {label = TranslateCap('ammo_rounds'), hash = `AMMO_PISTOL`}, | ||
| tints = Config.DefaultWeaponTints, | ||
| tints = Config.DefaultWeaponTints['non_mk2'], |
Contributor
There was a problem hiding this comment.
Suggested change
| tints = Config.DefaultWeaponTints['non_mk2'], | |
| tints = Config.DefaultWeaponTints, |
| } | ||
| }, | ||
| {name = 'WEAPON_CERAMICPISTOL', label = TranslateCap('weapon_ceramicpistol'), tints = Config.DefaultWeaponTints, components = {}, ammo = {label = TranslateCap('ammo_rounds'), hash = `AMMO_PISTOL`}}, | ||
| {name = 'WEAPON_CERAMICPISTOL', label = TranslateCap('weapon_ceramicpistol'), tints = Config.DefaultWeaponTints['non_mk2'], components = {}, ammo = {label = TranslateCap('ammo_rounds'), hash = `AMMO_PISTOL`}}, |
Contributor
There was a problem hiding this comment.
Suggested change
| {name = 'WEAPON_CERAMICPISTOL', label = TranslateCap('weapon_ceramicpistol'), tints = Config.DefaultWeaponTints['non_mk2'], components = {}, ammo = {label = TranslateCap('ammo_rounds'), hash = `AMMO_PISTOL`}}, | |
| {name = 'WEAPON_CERAMICPISTOL', label = TranslateCap('weapon_ceramicpistol'), tints = Config.DefaultWeaponTints, components = {}, ammo = {label = TranslateCap('ammo_rounds'), hash = `AMMO_PISTOL`}}, |
| label = TranslateCap('weapon_combatpistol'), | ||
| ammo = {label = TranslateCap('ammo_rounds'), hash = `AMMO_PISTOL`}, | ||
| tints = Config.DefaultWeaponTints, | ||
| tints = Config.DefaultWeaponTints['non_mk2'], |
Contributor
There was a problem hiding this comment.
Suggested change
| tints = Config.DefaultWeaponTints['non_mk2'], | |
| tints = Config.DefaultWeaponTints, |
Comment on lines
+121
to
+124
| {name = 'WEAPON_DOUBLEACTION', label = TranslateCap('weapon_doubleaction'), tints = Config.DefaultWeaponTints['non_mk2'], components = {}, ammo = {label = TranslateCap('ammo_rounds'), hash = `AMMO_PISTOL`}}, | ||
| {name = 'WEAPON_NAVYREVOLVER', label = TranslateCap('weapon_navyrevolver'), tints = Config.DefaultWeaponTints['non_mk2'], components = {}, ammo = {label = TranslateCap('ammo_rounds'), hash = `AMMO_PISTOL`}}, | ||
| {name = 'WEAPON_FLAREGUN', label = TranslateCap('weapon_flaregun'), tints = Config.DefaultWeaponTints['non_mk2'], components = {}, ammo = {label = TranslateCap('ammo_flaregun'), hash = `AMMO_FLAREGUN`}}, | ||
| {name = 'WEAPON_GADGETPISTOL', label = TranslateCap('weapon_gadgetpistol'), tints = Config.DefaultWeaponTints['non_mk2'], components = {}, ammo = {label = TranslateCap('ammo_rounds'), hash = `AMMO_PISTOL`}}, |
Contributor
There was a problem hiding this comment.
Suggested change
| {name = 'WEAPON_DOUBLEACTION', label = TranslateCap('weapon_doubleaction'), tints = Config.DefaultWeaponTints['non_mk2'], components = {}, ammo = {label = TranslateCap('ammo_rounds'), hash = `AMMO_PISTOL`}}, | |
| {name = 'WEAPON_NAVYREVOLVER', label = TranslateCap('weapon_navyrevolver'), tints = Config.DefaultWeaponTints['non_mk2'], components = {}, ammo = {label = TranslateCap('ammo_rounds'), hash = `AMMO_PISTOL`}}, | |
| {name = 'WEAPON_FLAREGUN', label = TranslateCap('weapon_flaregun'), tints = Config.DefaultWeaponTints['non_mk2'], components = {}, ammo = {label = TranslateCap('ammo_flaregun'), hash = `AMMO_FLAREGUN`}}, | |
| {name = 'WEAPON_GADGETPISTOL', label = TranslateCap('weapon_gadgetpistol'), tints = Config.DefaultWeaponTints['non_mk2'], components = {}, ammo = {label = TranslateCap('ammo_rounds'), hash = `AMMO_PISTOL`}}, | |
| {name = 'WEAPON_DOUBLEACTION', label = TranslateCap('weapon_doubleaction'), tints = Config.DefaultWeaponTints, components = {}, ammo = {label = TranslateCap('ammo_rounds'), hash = `AMMO_PISTOL`}}, | |
| {name = 'WEAPON_NAVYREVOLVER', label = TranslateCap('weapon_navyrevolver'), tints = Config.DefaultWeaponTints, components = {}, ammo = {label = TranslateCap('ammo_rounds'), hash = `AMMO_PISTOL`}}, | |
| {name = 'WEAPON_FLAREGUN', label = TranslateCap('weapon_flaregun'), tints = Config.DefaultWeaponTints], components = {}, ammo = {label = TranslateCap('ammo_flaregun'), hash = `AMMO_FLAREGUN`}}, | |
| {name = 'WEAPON_GADGETPISTOL', label = TranslateCap('weapon_gadgetpistol'), tints = Config.DefaultWeaponTints, components = {}, ammo = {label = TranslateCap('ammo_rounds'), hash = `AMMO_PISTOL`}}, |
| label = TranslateCap('weapon_microsmg'), | ||
| ammo = {label = TranslateCap('ammo_rounds'), hash = `AMMO_SMG`}, | ||
| tints = Config.DefaultWeaponTints, | ||
| tints = Config.DefaultWeaponTints['non_mk2'], |
Contributor
There was a problem hiding this comment.
Suggested change
| tints = Config.DefaultWeaponTints['non_mk2'], | |
| tints = Config.DefaultWeaponTints, |
| label = TranslateCap('weapon_mg'), | ||
| ammo = {label = TranslateCap('ammo_rounds'), hash = `AMMO_MG`}, | ||
| tints = Config.DefaultWeaponTints, | ||
| tints = Config.DefaultWeaponTints['non_mk2'], |
Contributor
There was a problem hiding this comment.
Suggested change
| tints = Config.DefaultWeaponTints['non_mk2'], | |
| tints = Config.DefaultWeaponTints, |
| label = TranslateCap('weapon_machinepistol'), | ||
| ammo = {label = TranslateCap('ammo_rounds'), hash = `AMMO_PISTOL`}, | ||
| tints = Config.DefaultWeaponTints, | ||
| tints = Config.DefaultWeaponTints['non_mk2'], |
Contributor
There was a problem hiding this comment.
Suggested change
| tints = Config.DefaultWeaponTints['non_mk2'], | |
| tints = Config.DefaultWeaponTints, |
| label = TranslateCap('weapon_gusenberg'), | ||
| ammo = {label = TranslateCap('ammo_rounds'), hash = `AMMO_MG`}, | ||
| tints = Config.DefaultWeaponTints, | ||
| tints = Config.DefaultWeaponTints['non_mk2'], |
Contributor
There was a problem hiding this comment.
Suggested change
| tints = Config.DefaultWeaponTints['non_mk2'], | |
| tints = Config.DefaultWeaponTints, |
| label = TranslateCap('weapon_combatpdw'), | ||
| ammo = {label = TranslateCap('ammo_rounds'), hash = `AMMO_SMG`}, | ||
| tints = Config.DefaultWeaponTints, | ||
| tints = Config.DefaultWeaponTints['non_mk2'], |
Contributor
There was a problem hiding this comment.
Suggested change
| tints = Config.DefaultWeaponTints['non_mk2'], | |
| tints = Config.DefaultWeaponTints, |
Author
|
thanks for the work @iSentrie |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.