Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
168 changes: 149 additions & 19 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 5 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,13 @@
"@types/react-router-config": "^5.0.1",
"@types/react-router-dom": "^5.1.5",
"@types/webpack-env": "^1.15.3",
"fs-extra": "^9.0.1",
"gh-pages": "^3.1.0",
"react-scripts": "^3.4.3",
"typescript": "^3.9.7"
"svgo": "^1.3.2",
"ts-node": "^9.1.1",
"typescript": "^3.9.7",
"xml2js": "^0.4.23"
},
"eslintConfig": {
"extends": "react-app"
Expand Down
32 changes: 16 additions & 16 deletions public/locales/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,25 +21,25 @@
"3k_dlc05_start_pos": "A World Betrayed",
"3k_main_campaign_map": "Rise of the Warlords",
"8p_start_pos": "Eight Princes",
"city": "City",
"copper": "Copper",
"craftsmen_armour": "Master Armourer",
"craftsmen_mounts": "Master Animal Tamer",
"craftsmen_weapon": "Master Weaponsmith",
"farms": "Farms",
"fish": "Fishing",
"city": "Capital of the Commandery",
"copper": "Copper Mine",
"craftsmen_armour": "Armour Craftsmen",
"craftsmen_mounts": "Animal Tamer",
"craftsmen_weapon": "Weapon Craftsmen",
"farms": "Rice Paddy",
"fish": "Fishing Port",
"gate_pass": "Gate Pass",
"horses": "Northern Horses",
"iron": "Iron",
"jade": "Jade",
"livestock": "Livestock",
"lumber": "Lumber",
"salt": "Salt",
"silk": "Silk",
"spice": "Spice",
"tea": "Tea",
"iron": "Iron Mine",
"jade": "Jade Mine",
"livestock": "Livestock Farm",
"lumber": "Lumber Yard",
"salt": "Salt Mine",
"silk": "Silk Trader",
"spice": "Spice Trader",
"tea": "Teahouse",
"temple": "Temple of Pengcheng",
"tools": "Tools",
"tools": "Toolmaker",
"trade_port": "Trade Port"
}
}
24 changes: 14 additions & 10 deletions src/App.tsx
Original file line number Diff line number Diff line change
@@ -1,19 +1,23 @@
import React from 'react';
import { Switch, Route } from 'react-router';
import routes from './config/routes';
import GlobalTooltip from './components/GlobalTooltip';

const App = () => {
return (
<Switch>
{routes.map((route) => (
<Route
key={route.path as string}
path={route.path}
exact={route.exact}
component={route.component}
/>
))}
</Switch>
<>
<Switch>
{routes.map((route) => (
<Route
key={route.path as string}
path={route.path}
exact={route.exact}
component={route.component}
/>
))}
</Switch>
<GlobalTooltip />
</>
);
};

Expand Down
3 changes: 3 additions & 0 deletions src/assets/flags/3k_dlc04_faction_bian_zhang/mon_24.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/assets/flags/3k_dlc04_faction_bian_zhang/mon_256.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/assets/flags/3k_dlc04_faction_bian_zhang/mon_64.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.
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.
3 changes: 3 additions & 0 deletions src/assets/flags/3k_dlc04_faction_cao_song/mon_24.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading