More Testmerge fixes

This commit is contained in:
Artur
2020-07-03 15:34:45 +03:00
parent 6c4e733a38
commit 82c6a02feb
9 changed files with 226 additions and 201 deletions

View File

@@ -37,222 +37,233 @@ export const ClockworkSlab = (props, context) => {
return (
<Window theme="clockcult">
<Window.Content scrollable>
<Fragment>
<Section>
<Button
content={recollection ? "Recital" : "Recollection"}
tooltip={"Tutorial"}
tooltipPosition={"right"}
onClick={() => act('toggle')}
/>
</Section>
{recollection ? ( // tutorial
<Section title="Recollection">
<Box>
{HONOR_RATVAR ? (
{recollection ? ( // tutorial
<Section
title="Recollection"
buttons={(
<Button
content="Recital"
icon="cog"
tooltipPosition={"left"}
onClick={() => act('toggle')} />
)}>
<Box>
{HONOR_RATVAR ? (
<Box
as="span"
textColor="#BE8700"
fontSize={2}
bold>
{REC_RATVAR}
</Box>
) : (
<Fragment>
<Box
as="span"
textColor="#BE8700"
fontSize={2}
fontSize={2} // 2rem
bold>
{REC_RATVAR}
Chetr nyy hagehguf naq ubabe Ratvar.
</Box>
<NoticeBox>
NOTICE: This information is out of date.
Read the Ark &amp; You primer in your backpack
or read the wiki page for current info.
</NoticeBox>
<Box>
These pages serve as the archives of Ratvar, the
Clockwork Justiciar. This section of your slab
has information on being as a Servant, advice
for what to do next, and pointers for serving the
master well. You should recommended that you check this
area for help if you get stuck or need guidance on
what to do next.
<br /> <br />
Disclaimer: Many objects, terms, and phrases, such as
Servant, Cache, and Slab, are capitalized like proper
nouns. This is a quirk of the Ratvarian language do
not let it confuse you! You are free to use the names
in pronoun form when speaking in normal languages.
</Box>
</Fragment>
)}
</Box>
{recollection_categories?.map(cat => {
return (
<Fragment key={cat.name} >
<br />
<Button
content={cat.name}
tooltip={cat.desc}
tooltipPosition={'right'}
onClick={() => act('rec_category', {
"category": cat.name,
})} />
</Fragment>
);
})}
<Divider />
<Box>
{data.rec_section}
<Box
as={'span'}
textColor={'#BE8700'}
fontSize={2.3}>
{rec_section?.title ? (
rec_section.title
) : (
<Fragment>
<Box
as="span"
textColor="#BE8700"
fontSize={2} // 2rem
bold>
Chetr nyy hagehguf naq ubabe Ratvar.
</Box>
<NoticeBox>
NOTICE: This information is out of date.
Read the Ark &amp; You primer in your backpack
or read the wiki page for current info.
</NoticeBox>
<Box>
These pages serve as the archives of Ratvar, the
Clockwork Justiciar. This section of your slab
has information on being as a Servant, advice
for what to do next, and pointers for serving the
master well. You should recommended that you check this
area for help if you get stuck or need guidance on
what to do next.
<br /> <br />
Disclaimer: Many objects, terms, and phrases, such as
Servant, Cache, and Slab, are capitalized like proper
nouns. This is a quirk of the Ratvarian language do
not let it confuse you! You are free to use the names
in pronoun form when speaking in normal languages.
</Box>
</Fragment>
'500 Server Internal archives not found.'
)}
</Box>
{recollection_categories?.map(cat => {
return (
<Fragment key={cat.name} >
<br />
<Button
content={cat.name}
tooltip={cat.desc}
tooltipPosition={'right'}
onClick={() => act('rec_category', {
"category": cat.name,
})} />
</Fragment>
);
})}
<Box>
{data.rec_section}
<Box
as={'span'}
textColor={'#BE8700'}
fontSize={2.3}>
{rec_section?.title ? (
rec_section.title
) : (
'500 Server Internal archives not found.'
)}
</Box>
<br /><br />
{rec_section?.info ? (
rec_section.info
<br /><br />
{rec_section?.info ? (
rec_section.info
) : (
"One of the cogscarabs must've misplaced this section."
)}
</Box>
<br />
<Divider />
<Box>
<Box
as={'span'}
textColor={'#BE8700'}
fontSize={2.3}>
Quickbound Scripture
</Box>
<br />
<Box as={'span'} italic>
You can have up to five scriptures bound to
action buttons for easy use.
</Box>
<br /><br />
{rec_binds?.map(bind => (
<Fragment key={bind.name ? bind.name : "none"}>
A <b>Quickbind</b> slot ({rec_binds.indexOf(bind)+1}),
currently set to&nbsp;
<span style={`color:${bind ? bind.color : "#BE8700"}`}>
{bind?.name ? bind.name : "None"}
</span>
.
<br />
</Fragment>
))}
</Box>
</Section>
) : (
<Section
title="Power"
buttons={(
<Button
content="Recollection"
icon="book"
tooltip={"Tutorial"}
tooltipPosition={"left"}
onClick={() => act('toggle')} />
)}>
<b>{power}</b> power is available for scripture
and other consumers.
<Section level={2}>
<Tabs>
{map((scriptures, name) => {
return (
<Tabs.Tab
key={name}
selected={tab === name}
onClick={() => setTab(name)}>
{name}
</Tabs.Tab>
);
})(scripture)}
</Tabs>
<Box
as={'span'}
textColor={'#B18B25'}
bold={!!tierInfo.ready} // muh booleans
italic={!tierInfo.ready}>
{tierInfo.ready ? (
"These scriptures are permanently unlocked."
) : (
"One of the cogscarabs must've misplaced this section."
tierInfo.requirement
)}
</Box>
<br />
<Box>
<Box
as={'span'}
textColor={'#BE8700'}
fontSize={2.3}>
Quickbound Scripture
</Box>
<br />
<Box as={'span'} italic>
You can have up to five scriptures bound to
action buttons for easy use.
</Box>
<br /><br />
{rec_binds?.map(bind => (
<Fragment key={bind.name}>
A <b>Quickbind</b> slot ({data.rec_binds[bind]}),
currently set to
<Box
as={'span'}
textColor={bind ? bind.color : "#BE8700"}
bold>
{bind?.name ? bind.name : "None"}
</Box>
.
<br />
</Fragment>
))}
<Box as={'span'} textColor={'#DAAA18'}>
Scriptures in <b>yellow</b> are related to
construction and building.
</Box>
</Section>
) : (
<Section title="Power">
<b>{power}</b> power is available for scripture
and other consumers.
<Section level={2}>
<Tabs>
{map((scriptures, name) => {
return (
<Tabs.Tab
key={name}
selected={tab === name}
onClick={() => setTab(name)}>
{name}
</Tabs.Tab>
);
})(scripture)}
</Tabs>
<Box
as={'span'}
textColor={'#B18B25'}
bold={!!tierInfo.ready} // muh booleans
italic={!tierInfo.ready}>
{tierInfo.ready ? (
"These scriptures are permanently unlocked."
) : (
tierInfo.requirement
)}
</Box>
<br />
<Box as={'span'} textColor={'#DAAA18'}>
Scriptures in <b>yellow</b> are related to
construction and building.
</Box>
<br />
<Box as={'span'} textColor={'#6E001A'}>
Scriptures in <b>red</b> are related to
attacking and offense.
</Box>
<br />
<Box as={'span'} textColor={'#1E8CE1'}>
Scriptures in <b>blue</b> are related to
healing and defense.
</Box>
<br />
<Box as={'span'} textColor={'#AF0AAF'}>
Scriptures in <b>purple</b> are niche but
still important!
</Box>
<br />
<Box as={'span'} textColor={'#DAAA18'} italic>
Scriptures with italicized names are
important to success.
</Box>
<Divider />
<Table>
{!!scriptInTab && scriptInTab.map(script => (
<Table.Row
key={script.name}
className="candystripe">
<Table.Cell
italic={!!script.important}
color={script.fontcolor}>
{`
${script.name}
<br />
<Box as={'span'} textColor={'#6E001A'}>
Scriptures in <b>red</b> are related to
attacking and offense.
</Box>
<br />
<Box as={'span'} textColor={'#1E8CE1'}>
Scriptures in <b>blue</b> are related to
healing and defense.
</Box>
<br />
<Box as={'span'} textColor={'#AF0AAF'}>
Scriptures in <b>purple</b> are niche but
still important!
</Box>
<br />
<Box as={'span'} textColor={'#DAAA18'} italic>
Scriptures with italicized names are
important to success.
</Box>
<Divider />
<Table>
{!!scriptInTab && scriptInTab.map(script => (
<Table.Row
key={script.name}
className="candystripe">
<Table.Cell
italic={!!script.important}
color={script.fontcolor}>
<b>
{script.name}
</b>
{`
${script.descname}
${script.invokers || ''}
`}
</Table.Cell>
<Table.Cell
collapsing
textAlign="right">
<Fragment>
<Button
content={`Recite ${script.required}`}
disabled={
script.required_unformatted >= power_unformatted
}
tooltip={script.tip}
tooltipPosition={'left'}
onClick={() => act('recite', {
'script': script.type,
})} />
<Button
content={script.bound ? (
`Unbind ${script.bound}`
) : (
'Quickbind'
)}
disabled={!script.quickbind}
onClick={() => act('bind', {
'script': script.type,
})} />
</Fragment>
</Table.Cell>
</Table.Row>
))}
</Table>
</Section>
</Table.Cell>
<Table.Cell
collapsing
textAlign="right">
<Button
content={`Recite ${script.required}`}
disabled={
script.required_unformatted >= power_unformatted
}
tooltip={script.tip}
tooltipPosition={'left'}
onClick={() => act('recite', {
'script': script.type,
})} />
</Table.Cell>
<Table.Cell
collapsing
textAlign="center">
<Button
fluid
content={script.bound ? (
`Unbind ${script.bound}`
) : (
'Quickbind'
)}
disabled={!script.quickbind}
onClick={() => act('bind', {
'script': script.type,
})} />
</Table.Cell>
</Table.Row>
))}
</Table>
</Section>
)}
</Fragment>
</Section>
)}
</Window.Content>
</Window>
);

File diff suppressed because one or more lines are too long