Skip to content

Commit

Permalink
Merge pull request #38 from Jayllyz/update-commanders
Browse files Browse the repository at this point in the history
New commanders update
  • Loading branch information
sho-87 authored Jun 14, 2022
2 parents bddd20b + 515acc9 commit 2d76764
Show file tree
Hide file tree
Showing 20 changed files with 326 additions and 1 deletion.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "rok-talents",
"title": "RoK Talents",
"version": "2.0.0",
"version": "2.1.0",
"dataVersion": 1,
"description": "Rise of Kingdoms talent builder",
"homepage": "https://roktalents.com",
Expand Down
Binary file added public/images/commanders/Alexander Nevsky.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/commanders/Amanitore.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/commanders/Bjorn Ironside.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/commanders/Boudica Prime.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/commanders/Cheok Jun Gyeong.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/commanders/Flavius Aetius.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/commanders/Gilgamesh.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/commanders/Henry V.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/commanders/Honda Tadakatsu.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/commanders/Imhotep.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/commanders/Kinich Janaab Pakal.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/commanders/Ragnar Lodbrok.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/commanders/Suleiman I.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/commanders/Thutmose III.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 10 additions & 0 deletions src/Modals.js
Original file line number Diff line number Diff line change
Expand Up @@ -295,6 +295,16 @@ export class AboutModal extends Component {
</Button>
<hr />
<h2>Release History</h2>
<Button
className="button-releases-history"
variant="primary"
size="sm"
onClick={() => {
this.showAnnouncement('2.1.0');
}}
>
2.1.0
</Button>
<Button
className="button-releases-history"
variant="primary"
Expand Down
130 changes: 130 additions & 0 deletions src/announcements/2_1.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,130 @@
import React from 'react';
import '../styles/Announcement.css';

const Announcement = React.memo((props) => {
return (
<>
<h1>{`Update: v2.1.0`}</h1>
<div>
Added new commanders: Pakal, Cheok Jun Gyeong, Gilgamesh, Amanitore, Honda Tadakatsu, Suleiman I, Alexander
Nevsky, Bertand du Guesclin, Flavius Aetius, Scipio Prime, Boudica Prime, Henry V, Ragnar Lodbrok, Bjorn
Ironside, Imhotep, Thutmose III.
</div>

<div className="announce-img-container">
<img
src={`${process.env.PUBLIC_URL}/images/commanders/Kinich Janaab Pakal.png`}
className="announce-img"
alt="Kinich Janaab Pakal"
></img>
</div>
<div className="announce-img-container">
<img
src={`${process.env.PUBLIC_URL}/images/commanders/Cheok Jun Gyeong.png`}
className="announce-img"
alt="Cheok Jun Gyeong"
></img>
</div>
<div className="announce-img-container">
<img
src={`${process.env.PUBLIC_URL}/images/commanders/Gilgamesh.png`}
className="announce-img"
alt="Gilgamesh"
></img>
</div>
<div className="announce-img-container">
<img
src={`${process.env.PUBLIC_URL}/images/commanders/Amanitore.png`}
className="announce-img"
alt="Amanitore"
></img>
</div>
<div className="announce-img-container">
<img
src={`${process.env.PUBLIC_URL}/images/commanders/Honda Tadakatsu.png`}
className="announce-img"
alt="Honda Tadakatsu"
></img>
</div>
<div className="announce-img-container">
<img
src={`${process.env.PUBLIC_URL}/images/commanders/Suleiman I.png`}
className="announce-img"
alt="Amanitore"
></img>
</div>
<div className="announce-img-container">
<img
src={`${process.env.PUBLIC_URL}/images/commanders/Alexander Nevsky.png`}
className="announce-img"
alt="Alexander Nevsky"
></img>
</div>
<div className="announce-img-container">
<img
src={`${process.env.PUBLIC_URL}/images/commanders/Bertrand du Guesclin.png`}
className="announce-img"
alt="Bertrand"
></img>
</div>
<div className="announce-img-container">
<img
src={`${process.env.PUBLIC_URL}/images/commanders/Flavius Aetius.png`}
className="announce-img"
alt="Flavius Aetius"
></img>
</div>
<div className="announce-img-container">
<img
src={`${process.env.PUBLIC_URL}/images/commanders/Scipio Africanus Prime.png`}
className="announce-img"
alt="Scipio Africanus Prime"
></img>
</div>
<div className="announce-img-container">
<img
src={`${process.env.PUBLIC_URL}/images/commanders/Boudica Prime.png`}
className="announce-img"
alt="Boudica Prime"
></img>
</div>
<div className="announce-img-container">
<img
src={`${process.env.PUBLIC_URL}/images/commanders/Henry V.png`}
className="announce-img"
alt="Henry V"
></img>
</div>
<div className="announce-img-container">
<img
src={`${process.env.PUBLIC_URL}/images/commanders/Ragnar Lodbrok.png`}
className="announce-img"
alt="Ragnar Lodbrok"
></img>
</div>
<div className="announce-img-container">
<img
src={`${process.env.PUBLIC_URL}/images/commanders/Thutmose III.png`}
className="announce-img"
alt="Thutmose III"
></img>
</div>
<div className="announce-img-container">
<img
src={`${process.env.PUBLIC_URL}/images/commanders/Bjorn Ironside.png`}
className="announce-img"
alt="Bjorn Ironside"
></img>
</div>
<div className="announce-img-container">
<img
src={`${process.env.PUBLIC_URL}/images/commanders/Imhotep.png`}
className="announce-img"
alt="Imhotep"
></img>
</div>
</>
);
});

export default Announcement;
185 changes: 185 additions & 0 deletions src/data/commanders.json
Original file line number Diff line number Diff line change
Expand Up @@ -573,5 +573,190 @@
"guides": {
"rokguide": "https://rok.guide/xiang-yu/"
}
},
"Gilgamesh": {
"id": "58",
"title": "Wrath of Ishtar",
"tier": "Legendary",
"red": "Archer",
"yellow": "Conquering",
"blue": "Skill",
"guides": {
"rokguide": "https://rok.guide/gilgamesh/"
}
},
"Amanitore": {
"id": "59",
"title": "Nubian Kandake",
"tier": "Legendary",
"red": "Archer",
"yellow": "Garrison",
"blue": "Support",
"guides": {
"rokguide": "https://rok.guide/amani/"
}
},
"Alexander Nevsky": {
"id": "60",
"shortName": "Nevsky",
"title": "The Hero of Neva River",
"tier": "Legendary",
"red": "Cavalry",
"yellow": "Versatility",
"blue": "Skill",
"guides": {
"rokguide": "https://rok.guide/alexander-nevsky/"
}
},
"Bertrand du Guesclin": {
"id": "61",
"shortName": "Bertrand",
"title": "The Eagle of Brittany",
"tier": "Legendary",
"red": "Cavalry",
"yellow": "Versatility",
"blue": "Defense",
"guides": {
"rokguide": "https://rok.guide/bertrand/"
}
},
"Flavius Aetius": {
"id": "62",
"shortName": "Flavius",
"title": "Patrician of Rome",
"tier": "Legendary",
"red": "Infantry",
"yellow": "Garrison",
"blue": "Support",
"guides": {
"rokguide": "https://rok.guide/flavius/"
}
},
"Scipio Africanus Prime": {
"id": "63",
"shortName": "Scipio Prime",
"title": "Hero of Zama",
"tier": "Legendary",
"red": "Infantry",
"yellow": "Versatility",
"blue": "Support",
"guides": {
"rokguide": "https://.rok.guide/scipio-africanus-hero-of-zama/"
}
},
"Honda Tadakatsu": {
"id": "64",
"shortName": "Honda",
"title": "The Deer of Tokugawa",
"tier": "Legendary",
"red": "Leadership",
"yellow": "Versatility",
"blue": "Skill",
"guides": {
"rokguide": "https://rok.guide/honda/"
}
},
"Boudica Prime": {
"id": "65",
"title": "Queen of the Iceni",
"tier": "Legendary",
"red": "Archer",
"yellow": "Versatility",
"blue": "Skill",
"guides": {
"rokguide": "https://rok.guide/boudica-queen-of-the-iceni/"
}
},
"Henry V": {
"id": "66",
"title": "Lancastrian King",
"tier": "Legendary",
"red": "Archer",
"yellow": "Conquering",
"blue": "Support",
"guides": {
"rokguide": "https://rok.guide/henry-v/"
}
},
"Kinich Janaab Pakal": {
"id": "67",
"shortName": "Pakal",
"title": "",
"tier": "Legendary",
"red": "Infantry",
"yellow": "Conquering",
"blue": "Defense",
"guides": {
"rokguide": "https://rok.guide/kinich-janaab-pakal/"
}
},
"Cheok Jun Gyeong": {
"id": "68",
"shortName": "Cheok",
"title": "",
"tier": "Legendary",
"red": "Infantry",
"yellow": "Versatility",
"blue": "Skill",
"guides": {
"rokguide": "https://rok.guide/cheok-jun-gyeong/"
}
},
"Ragnar Lodbrok": {
"id": "69",
"shortName": "Ragnar",
"title": "Legend of the North",
"tier": "Legendary",
"red": "Leadership",
"yellow": "Conquering",
"blue": "Attack",
"guides": {
"rokguide": "https://rok.guide/ragnar-lodbrok/"
}
},
"Bjorn Ironside": {
"id": "70",
"shortName": "Bjorn",
"title": "King of Kattegat",
"tier": "Epic",
"red": "Infantry",
"yellow": "Conquering",
"blue": "Skill",
"guides": {
"rokguide": "https://rok.guide/bjorn-ironside/"
}
},
"Thutmose III": {
"id": "71",
"title": "Beloved of Thoth",
"tier": "Legendary",
"red": "Archer",
"yellow": "Versatility",
"blue": "Support",
"guides": {
"rokguide": "https://rok.guide/thutmose-iii/"
}
},
"Imhotep": {
"id": "72",
"title": "Man of Peace",
"tier": "Epic",
"red": "Archer",
"yellow": "Garrison",
"blue": "Support",
"guides": {
"rokguide": "https://rok.guide/imhotep/"
}
},
"Suleiman I": {
"id": "73",
"title": "Kanuni",
"tier": "Legendary",
"red": "Leadership",
"yellow": "Conquering",
"blue": "Attack",
"guides": {
"rokguide": "https://rok.guide/suleiman-i/"
}
}
}

0 comments on commit 2d76764

Please sign in to comment.