Merge pull request 'Rework of the Classes in the tablegen' (#12) from othertable into main
Reviewed-on: #12
This commit is contained in:
commit
791108e58d
|
|
@ -1,20 +1,24 @@
|
|||
[classes]
|
||||
header = '\subsubsection{Tier {}}'
|
||||
|
||||
row = '''\begin{longtblr}{
|
||||
colspec = {|Q[h,j,wd=3.5cm] Q[c,h, wd=0.52cm] h{2.5cm} Q[c,h,wd=0.75cm] Q[h,j,wd=8.4cm]|},
|
||||
hspan = minimal, vspan=minimal,
|
||||
width = 1\columnwidth,
|
||||
colsep = 2mm, abovesep=0px,belowsep=0px, leftsep=3px, rightsep=3px,
|
||||
row{odd} = {gray!25}, row{1} = {gray!50},
|
||||
cells = {font = \footnotesize\selectfont}
|
||||
header = '''\begin{}[
|
||||
presep = 0pt, postsep = 0pt,
|
||||
]{
|
||||
colspec = {Q[h,j,wd=3.5cm] Q[c,h, wd=0.52cm] h{2.5cm} Q[c,h,wd=0.75cm] Q[h,j,wd=8.4cm]},
|
||||
hspan = minimal, vspan=minimal,
|
||||
{} width = 1\columnwidth,
|
||||
colsep = 2mm, abovesep=0px,belowsep=0px, leftsep=3px, rightsep=3px,
|
||||
row{1 } = {bg=coheaderschools, fg=white},
|
||||
row{even } = {bg=coevenschools},
|
||||
cells = {font = \footnotesize\selectfont}
|
||||
}
|
||||
\hline
|
||||
Technique & Niv & Type & Coût & Effet\\
|
||||
\hline'''
|
||||
'''
|
||||
|
||||
end = ''' \hline
|
||||
\end{longtblr}'''
|
||||
tier = ''' \SetRow{white }&&&&\\
|
||||
\SetCell[c=5]{white } {\normalsize \textbf{ Tiers {} }} \\
|
||||
\hline
|
||||
\SetRow{bg=coheaderschools}Technique & Niv & Type & Coût & Effet\\
|
||||
\hline'''
|
||||
|
||||
end = '''\end{longtblr}'''
|
||||
|
||||
[craft]
|
||||
header_alchemy = '''\begin{landscape}\begin{center}
|
||||
|
|
@ -22,29 +26,29 @@ header_alchemy = '''\begin{landscape}\begin{center}
|
|||
entry = none,
|
||||
label = none,
|
||||
]{
|
||||
colspec = {|X[-1]X[-1]X[-1]X[-1]X[-1]X[-1]X[-1]|},
|
||||
cells = {font = \footnotesize\selectfont},
|
||||
row{1} = {bg=cobluel, fg=white},
|
||||
row{even} = {coblueL},
|
||||
hspan = minimal, vspan=minimal,
|
||||
colsep = 2mm, abovesep=0px,belowsep=0px, leftsep=3px, rightsep=3px,
|
||||
colspec = {|X[-1]X[-1]X[-1]X[-1]X[-1]X[-1]X[-1]|},
|
||||
cells = {font = \footnotesize\selectfont},
|
||||
row{1} = {bg=cobluel, fg=white},
|
||||
row{even} = {coblueL},
|
||||
hspan = minimal, vspan=minimal,
|
||||
colsep = 2mm, abovesep=0px,belowsep=0px, leftsep=3px, rightsep=3px,
|
||||
}
|
||||
\hline
|
||||
Ingrédient & Partie & Rareté & Effet (Principal) & Effets (Catalysé) & Difficulté & Toxicité \\
|
||||
\hline
|
||||
Ingrédient & Partie & Rareté & Effet (Principal) & Effets (Catalysé) & Difficulté & Toxicité \\
|
||||
\hline'''
|
||||
header_armors = '''\begin{landscape}\begin{center}
|
||||
\begin{longtblr}[
|
||||
entry = none,
|
||||
label = none,
|
||||
entry = none,
|
||||
label = none,
|
||||
]{
|
||||
colspec = {|X[-1]X[-1]X[-1]X[-1]X[-1]X[-1]X[-1]X[-1]X[-1]X[-1]X[-1]X[-1]X[-1]X[-1]Q[wd=4cm]|},
|
||||
cells = {font = \footnotesize\selectfont},
|
||||
row{1} = {bg=cobluel, fg=white},
|
||||
row{even} = {coblueL},
|
||||
hspan = minimal, vspan=minimal,
|
||||
colsep = 2mm, abovesep=0px,belowsep=0px, leftsep=3px, rightsep=3px,
|
||||
colspec = {|X[-1]X[-1]X[-1]X[-1]X[-1]X[-1]X[-1]X[-1]X[-1]X[-1]X[-1]X[-1]X[-1]X[-1]Q[wd=4cm]|},
|
||||
cells = {font = \footnotesize\selectfont},
|
||||
row{1} = {bg=cobluel, fg=white},
|
||||
row{even} = {coblueL},
|
||||
hspan = minimal, vspan=minimal,
|
||||
colsep = 2mm, abovesep=0px,belowsep=0px, leftsep=3px, rightsep=3px,
|
||||
}
|
||||
\hline
|
||||
\hline
|
||||
Nom & Rareté & Dégâts & + & R.Max & Armor.B & Prot & Int. & Deux M & Une M & Esq. & Parr. & Vitesse & Discrétion & Spécial \\
|
||||
\hline'''
|
||||
header_forge = ''' Ingrédient & Rareté & Densité & Effet Armes (Principal) & Effet Armures (Principal) & Effets Armes (Catalysé) & Effet Armures (C) & Difficulté & Préparation \\
|
||||
|
|
@ -54,42 +58,42 @@ header_weapons = '''\begin{landscape}\begin{center}
|
|||
entry = none,
|
||||
label = none,
|
||||
]{
|
||||
colspec = {|X[-1]X[-1]X[-1]X[-1]X[-1]X[-1]X[-1]X[-1]X[-1]X[-1]X[-1]X[-1]X[-1]X[-1]X[-1]X[-1]Q[wd=4cm]|},
|
||||
cells = {font = \footnotesize\selectfont},
|
||||
row{1} = {bg=cobluel, fg=white},
|
||||
row{even} = {coblueL},
|
||||
hspan = minimal, vspan=minimal,
|
||||
colsep = 2mm, abovesep=0px,belowsep=0px, leftsep=3px, rightsep=3px,
|
||||
colspec = {|X[-1]X[-1]X[-1]X[-1]X[-1]X[-1]X[-1]X[-1]X[-1]X[-1]X[-1]X[-1]X[-1]X[-1]X[-1]X[-1]Q[wd=4cm]|},
|
||||
cells = {font = \footnotesize\selectfont},
|
||||
row{1} = {bg=cobluel, fg=white},
|
||||
row{even} = {coblueL},
|
||||
hspan = minimal, vspan=minimal,
|
||||
colsep = 2mm, abovesep=0px,belowsep=0px, leftsep=3px, rightsep=3px,
|
||||
}
|
||||
\hline
|
||||
\hline
|
||||
Nom & \rotbx{Rareté} & \rotbx{Dégâts} & + & \rotbx{R.Max} & \rotbx{Armr.B} & \rotbx{Protbx} & \rotbx{Int.} & \rotbx{Deux M} & \rotbx{Une M} & \rotbx{Esq.} & \rotbx{Parr.} & \rotbx{Vitesse} & \rotbx{Discr.} & \rotbx{Catégorie} & \rotbx{Modes} & \rotbx{Spécial} \\
|
||||
\hline'''
|
||||
\hline'''
|
||||
header_food = '''\begin{landscape}\begin{center}
|
||||
\begin{longtblr}[
|
||||
entry = none,
|
||||
label = none,
|
||||
entry = none,
|
||||
label = none,
|
||||
]{
|
||||
colspec = {|X[-1]X[-1]X[-1]X[-1]X[-1]X[-1]X[-1]X[-1]|},
|
||||
cells = {font = \footnotesize\selectfont},
|
||||
row{1} = {bg=cobluel, fg=white},
|
||||
row{even} = {coblueL},
|
||||
hspan = minimal, vspan=minimal,
|
||||
colsep = 2mm, abovesep=0px,belowsep=0px, leftsep=3px, rightsep=3px,
|
||||
colspec = {|X[-1]X[-1]X[-1]X[-1]X[-1]X[-1]X[-1]X[-1]|},
|
||||
cells = {font = \footnotesize\selectfont},
|
||||
row{1} = {bg=cobluel, fg=white},
|
||||
row{even} = {coblueL},
|
||||
hspan = minimal, vspan=minimal,
|
||||
colsep = 2mm, abovesep=0px,belowsep=0px, leftsep=3px, rightsep=3px,
|
||||
}
|
||||
\hline
|
||||
Ingrédient & Partie & Rareté & Satiété & Effet (Plat) & Effets (Accompagnement) & Difficulté & Toxicité \\
|
||||
\hline'''
|
||||
\hline
|
||||
Ingrédient & Partie & Rareté & Satiété & Effet (Plat) & Effets (Accompagnement) & Difficulté & Toxicité \\
|
||||
\hline'''
|
||||
header_mtrap = '''\begin{landscape}\begin{center}
|
||||
\begin{longtblr}[
|
||||
entry = none,
|
||||
label = none,
|
||||
entry = none,
|
||||
label = none,
|
||||
]{
|
||||
colspec = {|X[-1]X[-1]X[-1]X[-1]X[-1]|},
|
||||
cells = {font = \footnotesize\selectfont},
|
||||
row{1} = {bg=cobluel, fg=white},
|
||||
row{even} = {coblueL},
|
||||
hspan = minimal, vspan=minimal,
|
||||
colsep = 2mm, abovesep=0px,belowsep=0px, leftsep=3px, rightsep=3px,
|
||||
colspec = {|X[-1]X[-1]X[-1]X[-1]X[-1]|},
|
||||
cells = {font = \footnotesize\selectfont},
|
||||
row{1} = {bg=cobluel, fg=white},
|
||||
row{even} = {coblueL},
|
||||
hspan = minimal, vspan=minimal,
|
||||
colsep = 2mm, abovesep=0px,belowsep=0px, leftsep=3px, rightsep=3px,
|
||||
}
|
||||
\hline
|
||||
Élément & Prix & Effet & Difficulté & Activation & Solidité \\
|
||||
|
|
@ -97,42 +101,42 @@ header_mtrap = '''\begin{landscape}\begin{center}
|
|||
header_traps = ''' Nom & Type & Prix & Toxicité & Effet \\
|
||||
\hline'''
|
||||
header_gadgets ='''\begin{center}
|
||||
\begin{longtblr}[
|
||||
entry = none,
|
||||
label = none,
|
||||
\begin{longtblr}[
|
||||
entry = none,
|
||||
label = none,
|
||||
]{
|
||||
colspec = {|X[-1]XX[-1]|},
|
||||
cells = {font = \footnotesize\selectfont},
|
||||
row{1} = {bg=cobluel, fg=white},
|
||||
row{even} = {coblueL},
|
||||
hspan = minimal, vspan=minimal,
|
||||
colsep = 2mm, abovesep=0px,belowsep=0px, leftsep=3px, rightsep=3px,
|
||||
}
|
||||
\hline
|
||||
colspec = {|X[-1]XX[-1]|},
|
||||
cells = {font = \footnotesize\selectfont},
|
||||
row{1} = {bg=cobluel, fg=white},
|
||||
row{even} = {coblueL},
|
||||
hspan = minimal, vspan=minimal,
|
||||
colsep = 2mm, abovesep=0px,belowsep=0px, leftsep=3px, rightsep=3px,
|
||||
}
|
||||
\hline
|
||||
Nom & Effet & Prix\\'''
|
||||
header_potions = '''\begin{center}
|
||||
\begin{longtblr}[
|
||||
entry = none,
|
||||
label = none,
|
||||
]{
|
||||
colspec = {|X[-1]X[-1]X[-1]X[-1]X|},
|
||||
cells = {font = \footnotesize\selectfont},
|
||||
row{1} = {bg=cobluel, fg=white},
|
||||
row{even} = {coblueL},
|
||||
hspan = minimal, vspan=minimal,
|
||||
colsep = 2mm, abovesep=0px,belowsep=0px, leftsep=3px, rightsep=3px,
|
||||
entry = none,
|
||||
label = none,
|
||||
]{
|
||||
colspec = {|X[-1]X[-1]X[-1]X[-1]X|},
|
||||
cells = {font = \footnotesize\selectfont},
|
||||
row{1} = {bg=cobluel, fg=white},
|
||||
row{even} = {coblueL},
|
||||
hspan = minimal, vspan=minimal,
|
||||
colsep = 2mm, abovesep=0px,belowsep=0px, leftsep=3px, rightsep=3px,
|
||||
}
|
||||
\hline
|
||||
\hline
|
||||
Nom & Type & Prix & Toxicité & Effet \\
|
||||
\hline'''
|
||||
end = ''' \hline
|
||||
\end{tblr}
|
||||
\end{tblr}
|
||||
}'''
|
||||
end_long = ''' \hline
|
||||
\end{longtblr}
|
||||
\end{longtblr}
|
||||
\end{center}
|
||||
'''
|
||||
end_long_side = ''' \hline
|
||||
\end{longtblr}
|
||||
\end{longtblr}
|
||||
\end{center}\end{landscape}'''
|
||||
end_empty = ""
|
||||
|
|
|
|||
|
|
@ -87,7 +87,7 @@ struct Classes {
|
|||
/// The header string formatter
|
||||
header: String,
|
||||
/// The row string formatter
|
||||
row: String,
|
||||
tier: String,
|
||||
/// The table end string formatter
|
||||
end: String,
|
||||
}
|
||||
|
|
|
|||
|
|
@ -115,6 +115,7 @@ async fn launch_subprocess(
|
|||
|
||||
let mut built = 0;
|
||||
let mut to_build = last_run.lines_parsed;
|
||||
let last_duration = last_run.time_ellapsed.as_secs_f64();
|
||||
|
||||
if args.non_interactive {
|
||||
cmd.arg("--interaction=nonstopmode");
|
||||
|
|
@ -154,8 +155,8 @@ async fn launch_subprocess(
|
|||
"{spinner:.green} [{elapsed_precise}] [{wide_bar:.cyan/blue}] (lines: {pos}/{len}) (speed: {per_sec}) (eta: {eta})",
|
||||
)
|
||||
.unwrap()
|
||||
.with_key("eta", |state: &ProgressState, w: &mut dyn Write| {
|
||||
write!(w, "{:.1}s", state.eta().as_secs_f64()).unwrap()
|
||||
.with_key("eta", move |state: &ProgressState, w: &mut dyn Write| {
|
||||
write!(w, "{:.1}s", (last_duration - state.elapsed().as_secs_f64()).max(0.)).unwrap()
|
||||
})
|
||||
.with_key("per_sec",|state:&ProgressState,w:&mut dyn Write|{
|
||||
write!(w,"{:.1}/lps",state.per_sec()).unwrap()
|
||||
|
|
|
|||
|
|
@ -432,11 +432,11 @@ impl Status {
|
|||
.iter()
|
||||
.enumerate()
|
||||
.map(|(i, d)| format!(
|
||||
"{} Chapter {} {} - {:.2?}",
|
||||
"{} Chapter {} {} - {:.2?}s",
|
||||
COL_CONTEXT.apply_to("[===>]"),
|
||||
i + 1,
|
||||
file_info.chapt_list.get(i).unwrap_or(&"???".to_string()),
|
||||
*d
|
||||
d.as_secs_f64()
|
||||
))
|
||||
.collect::<Vec<String>>()
|
||||
.join("\n")
|
||||
|
|
|
|||
|
|
@ -110,19 +110,44 @@ pub(super) trait TypedRow {
|
|||
impl WriteTable for ClassesArray {
|
||||
fn write_table(&self, config: &Config) -> Result<String> {
|
||||
let mut buffer = BufWriter::new(Vec::new());
|
||||
let mut header_string = String::new();
|
||||
let mut o_row;
|
||||
let mut c_row = 0;
|
||||
for (lvl, tier) in self.tiers.iter().skip(1).enumerate() {
|
||||
c_row += 3;
|
||||
o_row = c_row;
|
||||
// rt_write!(buffer, config.classes.header, lvl + 1)?;
|
||||
let formatted_header = SimpleCurlyFormat
|
||||
.format(&config.classes.header, [lvl + 1])
|
||||
.expect("Formatting failed");
|
||||
writeln!(buffer, "{}", formatted_header)?;
|
||||
writeln!(buffer, "{}", config.classes.row)?;
|
||||
let formatted_tier = SimpleCurlyFormat
|
||||
.format(&config.classes.tier, [lvl + 1])
|
||||
.expect("Formatting of header failed");
|
||||
// vline{1,6} = {3-11}{solid},
|
||||
// vline{1,6} = {14-19}{solid},
|
||||
// vline{1,6} = {21-26}{solid},
|
||||
// vline{1,6} = {29-34}{solid},
|
||||
// let formatted_header = SimpleCurlyFormat
|
||||
// .format(&config.classes.header, [lvl + 1])
|
||||
// .expect("Formatting failed");
|
||||
writeln!(buffer, "{}", formatted_tier)?;
|
||||
for elem in tier {
|
||||
c_row += 1;
|
||||
elem.write_row(&mut buffer, config, NO_STRING)?
|
||||
}
|
||||
writeln!(buffer, "{}", config.classes.end)?;
|
||||
writeln!(buffer, "\\hline")?;
|
||||
header_string.push_str(&format!(
|
||||
" vline{{1,6}} = {{{}-{}}}{{solid}},\n",
|
||||
o_row, c_row
|
||||
));
|
||||
// .expect("Writing header format");
|
||||
}
|
||||
Ok(String::from_utf8(buffer.into_inner()?)?)
|
||||
writeln!(buffer, "{}", config.classes.end)?;
|
||||
let formatted_header = SimpleCurlyFormat
|
||||
.format(&config.classes.header, ["{longtblr}", &header_string])
|
||||
.expect("Couldn't format the table header");
|
||||
buffer.flush()?;
|
||||
let mut h = formatted_header.as_bytes().to_vec();
|
||||
h.extend_from_slice(&buffer.into_inner()?);
|
||||
// writeln!(buffer, "{}", &config.classes.header)?;
|
||||
Ok(String::from_utf8(h)?)
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -169,7 +194,7 @@ where
|
|||
row.write_row(&mut buffer, config, NO_STRING)?;
|
||||
}
|
||||
let footer = match self.get_type() {
|
||||
TableTargets::Classes => unimplemented!("Classes can't be handle by generics"),
|
||||
TableTargets::Classes => unimplemented!("Classes can't be handled by generics"),
|
||||
TableTargets::Gadgets | TableTargets::Potions => &config.craft.end_long,
|
||||
_ => &config.craft.end_long_side,
|
||||
};
|
||||
|
|
@ -207,7 +232,7 @@ impl WriteRow for StringRecord {
|
|||
write!(
|
||||
buffer,
|
||||
" {}",
|
||||
itr.next().context("Writing firt element of row")?
|
||||
itr.next().context("Writing element of row")?
|
||||
)?;
|
||||
for e in itr {
|
||||
write!(buffer, " & {}", make_latex_string(e)).context("Writing row")?
|
||||
|
|
|
|||
Loading…
Reference in New Issue