Leahnaya/chaoticbackup.github.io
1
0
Fork 0
mirror of https://github.com/chaoticbackup/chaoticbackup.github.io.git synced 2026-04-26 01:02:54 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

mugic counters #17

Browse Source
This commit is contained in:
Daniel 2017-12-29 11:30:28 -05:00
parent d5e9162994
commit c79d6129f0
3 changed files with 27 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
build/bundle.js
View File

File diff suppressed because one or more lines are too long

3
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "chaoticbackup", "name": "chaoticbackup",
"version": "0.1.0", "version": "1.0.0",
"description": "Chaotic Backup", "description": "Chaotic Backup",
"scripts": { "scripts": {
"start": "webpack-dev-server -d --inline --host 0.0.0.0 --history-api-fallback --progress", "start": "webpack-dev-server -d --inline --host 0.0.0.0 --history-api-fallback --progress",
@ -21,6 +21,7 @@
"react-digit-input": "^1.0.0", "react-digit-input": "^1.0.0",
"react-dom": "^16.0.0", "react-dom": "^16.0.0",
"react-interactive": "^0.8.1", "react-interactive": "^0.8.1",
"react-process-string": "^1.2.0",
"react-router": "^3.2.0", "react-router": "^3.2.0",
"react-router-dom": "^4.2.2", "react-router-dom": "^4.2.2",
"react-transition-group": "^1.2.1", "react-transition-group": "^1.2.1",

22
src/components/collection/Creature.js
View File

@ -4,6 +4,7 @@ import API from '../SpreadsheetData';
import s from '../../styles/app.style'; import s from '../../styles/app.style';
import {observable} from "mobx"; import {observable} from "mobx";
import {observer, inject} from 'mobx-react'; import {observer, inject} from 'mobx-react';
import processString from 'react-process-string';
@inject((stores, props, context) => props) @observer @inject((stores, props, context) => props) @observer
export default class Creature extends React.Component { export default class Creature extends React.Component {
@ -19,20 +20,17 @@ export default class Creature extends React.Component {
mugic.push(<img className="icon" src={"/src/img/icons/mugic/"+(creature.gsx$tribe.toLowerCase()||"generic")+".png"} alt="MC" key={i} />); mugic.push(<img className="icon" src={"/src/img/icons/mugic/"+(creature.gsx$tribe.toLowerCase()||"generic")+".png"} alt="MC" key={i} />);
} }
// function test() { let mugic_counters = {
// console.log( {__html: regex: /{{mc}}/i,
// '<span>' + creature.gsx$ability.replace(/{{mc}}/i, fn: (key, result) => {
// <img className="icon" src={"/src/img/icons/mugic/"+(creature.gsx$tribe.toLowerCase()||"generic")+".png"} alt="MC" /> return <img key={key} className="icon" style={{'height': '16px'}} src={"/src/img/icons/mugic/"+(creature.gsx$tribe.toLowerCase()||"generic")+".png"} alt="MC" />
// ) + '</span>' }
// }); }
// }
let brainwashed = () => { let brainwashed = () => {
if (creature.gsx$brainwashed) { if (creature.gsx$brainwashed) {
return (<span> return (<span className="brainwashed" style={{'whiteSpace': 'pre-line'}}>{processString([mugic_counters])(creature.gsx$brainwashed)}<br />
<div className="brainwashed">{creature.gsx$brainwashed}</div> </span>);
<br /></span>
);
} }
} }
@ -49,7 +47,7 @@ export default class Creature extends React.Component {
</div> </div>
<br /> <br />
<div style={{float: 'left', width: 'calc(100% - (100px + 230px + 50px))', borderLeft: '1px solid white', paddingLeft: '10px'}} > <div style={{float: 'left', width: 'calc(100% - (100px + 230px + 50px))', borderLeft: '1px solid white', paddingLeft: '10px'}} >
<span>{creature.gsx$ability}</span><br /> <span style={{'whiteSpace': 'pre-line'}}>{processString([mugic_counters])(creature.gsx$ability)}</span><br />
{brainwashed()} {brainwashed()}
<span><i>{creature.gsx$flavortext}</i></span> <span><i>{creature.gsx$flavortext}</i></span>
</div> </div>