Merge pull request #201 from klotterc/master

added vip/pct
hibiyasleep · Jun 30, 2024 · 753d0d3 · 753d0d3
2 parents 78ba77e + 0b813b6
commit 753d0d3
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 3 deletions.
diff --git a/config/index.html b/config/index.html
@@ -1036,6 +1036,32 @@ <h3 data-locale="config.color.position-deal">
  data-config-key="color.dnc"
  data-style="background" />
  </span>
+ <p class="control">
+ <label for="input-color-vpr" data-locale="config.color.vpr">
+ 닌자 <span class="text-muted">(쌍검사)</span>
+ </label>
+ <span class="input-group">
+ <label class="input-value-style job class-vpr" for="input-color-vpr">
+ <span class="flex-column-i-icon"></span>
+ </label>
+ <input type="text" id="input-color-vpr" style="width: 10rem"
+ data-config-key="color.vpr"
+ data-style="background" />
+ </span>
+ </p>
+ <p class="control">
+ <label for="input-color-pct" data-locale="config.color.pct">
+ 닌자 <span class="text-muted">(쌍검사)</span>
+ </label>
+ <span class="input-group">
+ <label class="input-value-style job class-pct" for="input-color-pct">
+ <span class="flex-column-i-icon"></span>
+ </label>
+ <input type="text" id="input-color-pct" style="width: 10rem"
+ data-config-key="color.pct"
+ data-style="background" />
+ </span>
+ </p>
  </p>
  </article>
  <article>

diff --git a/overlay/css/table.css b/overlay/css/table.css
@@ -97,6 +97,8 @@
 .class-lnc .gauge, .class-drg .gauge { background: var(--drg); }
 .class-rpr .gauge { background: var(--rpr); }
 .class-sge .gauge { background: var(--sge); }
+.class-vpr .gauge { background: var(--vpr); }
+.class-pct .gauge { background: var(--pct); }
 .class-arc .gauge, .class-brd .gauge { background: var(--brd); }
 .class-rog .gauge, .class-nin .gauge { background: var(--nin); }
 .class-acn .gauge, .class-smn .gauge { background: var(--smn); }

diff --git a/share/css/job-icons.css b/share/css/job-icons.css
@@ -36,6 +36,8 @@
 .class-dnc > .flex-column-i-icon { background-position: 70% 40% }
 .class-rpr > .flex-column-i-icon { background-position: 80% 40% }
 .class-sge > .flex-column-i-icon { background-position: 90% 40% }
+.class-vpr > .flex-column-i-icon { background-position: 30% 100% }
+.class-pct > .flex-column-i-icon { background-position: 40% 100% }
 .class-acn-pet > .flex-column-i-icon { background-position: 0% 60% }
 .class-garuda > .flex-column-i-icon { background-position: 10% 60% }
 .class-ifrit > .flex-column-i-icon { background-position: 20% 60% }

diff --git a/share/img/classes.png b/share/img/classes.png
diff --git a/share/img/composition.tsv b/share/img/composition.tsv
@@ -3,4 +3,4 @@ pld war mnk drg nin brd blm smn sch whm
 drk mch ast sam rdm blu gnb dnc rpr sge 
 acn-pet garuda ifrit titan eos selene rook bishop error 
 crp bsm arm gsm ltw wvr alc cul chocobo 
-min btn fsh   limit 
+min btn fsh vpr pct limit 
diff --git a/share/lang/en.json b/share/lang/en.json
@@ -197,8 +197,10 @@
  "mch": "Machinist",
  "sam": "Samurai",
  "rpr": "Reaper",
+ "vpr": "Viper",
  "rdm": "Red Mage",
  "blu": "Blue Mage",
+ "pct": "Pictomancer",
  "dnc": "Dancer",
  "whm": "White Mage (Conjurer)",
  "sch": "Scholar",

diff --git a/share/lib/config.js b/share/lib/config.js
@@ -144,11 +144,13 @@ const CONFIG_DEFAULT = {
  brd: 'rgb(158, 157, 36)', // Lime 800
  nin: 'rgb(211, 47, 47)', // Red 700 // 와! 시바! 진성! 닌자다!
  rpr: 'rgb(254, 179, 0)', // Amber 600
+ vpr: 'rgb(128, 0, 0)', // dark red
  smn: 'rgb(46, 125, 50)', // Green 800
  blm: 'rgb(126, 87, 194)', // Deep Purple 400
  mch: 'rgb(0, 151, 167)', // Cyan 700
  rdm: 'rgb(233, 30, 99)', // Pink 500
  blu: 'rgb(0, 185, 247)', // Light Blue 500
+ pct: 'rgb(255, 255, 102)', // light yellow
  dnc: 'rgb(244, 143, 177)', // Pink 200
  sam: 'rgb(255, 202, 40)', // Amber 400
  whm: 'rgb(117, 117, 117)', // Gray 600
@@ -248,8 +250,8 @@ const COLUMN_USE_LARGER = {
 
 const VALID_PLAYER_JOBS = [
  'GLA', 'GLD', 'MRD', 'PUG', 'PGL', 'LNC', 'ROG', 'ARC', 'THM', 'ACN', 'CNJ',
- 'PLD', 'WAR', 'MNK', 'DRG', 'NIN', 'RPR', 'BRD', 'BLM', 'SMN', 'SCH', 'WHM',
- 'DRK', 'MCH', 'AST', 'SGE', 'SAM', 'RDM', 'BLU', 'GNB', 'DNC',
+ 'PLD', 'WAR', 'MNK', 'DRG', 'NIN', 'RPR', 'VPR', 'BRD', 'BLM', 'SMN', 'SCH', 'WHM',
+ 'DRK', 'MCH', 'AST', 'SGE', 'SAM', 'RDM', 'PCT', 'BLU', 'GNB', 'DNC',
  'CRP', 'BSM', 'ARM', 'GSM', 'LTW', 'WVR', 'ALC', 'CUL', 'MIN', 'BTN', 'FSH'
 ]