diff --git a/public/content/instructions.md b/public/content/instructions.md index 8b0241a..cd9beee 100644 --- a/public/content/instructions.md +++ b/public/content/instructions.md @@ -97,7 +97,7 @@ New equipment becomes accessible as soon as you train a new scientist, and purch
---Coming Soon-- +Badges are bling - vanity items that appear next to your name on the game ladder and profile. Some are easy to unlock, others require specific situations. Others still are exclusives, and no longer available. You can see a full list of badges on the [badges list page](/badges/list). diff --git a/public/content/rules.md b/public/content/rules.md index bc94a14..3447635 100644 --- a/public/content/rules.md +++ b/public/content/rules.md @@ -1,2 +1,4 @@ * No usernames that are outright hurtful, attack any group or individual, or deliberately cross the line. * Using automated user accounts, or "botting", is not allowed and will result in an immediate ban. +* One account per player. +* Don't make me add more rules. \ No newline at end of file diff --git a/public/content/task_list.md b/public/content/task_list.md index 8c4da58..7f8df42 100644 --- a/public/content/task_list.md +++ b/public/content/task_list.md @@ -1,8 +1,6 @@ Major --- -* Implement badges. -* Write the instructions for badges. * Implement countdown timers for combat and training. * Implement referral links. * Implement admin panel (write posts without having to commit). @@ -30,6 +28,7 @@ Patch * Ezekiel-powered discord role for kingdom battles players. * Refactor callback-hell (yes, it is that bad). * Treasure? +* Add a link home to the verification message. Potential And Confirmed Bugs --- @@ -45,6 +44,7 @@ Wishlist * Implement nations (player alliances) (sending items/gold). * In-game chat. * Structures / shields. +* Sharding. Event Ideas --- @@ -54,7 +54,7 @@ Event Ideas Badge Ideas --- -* alpha tester +* ~~alpha tester~~ * capture the flag * king of the hill * gold horde diff --git a/public/news/2019-06-08-02.md b/public/news/2019-06-08-02.md index 082678d..8a424d3 100644 --- a/public/news/2019-06-08-02.md +++ b/public/news/2019-06-08-02.md @@ -8,3 +8,4 @@ There are five badges so far, but I need to actually code in the triggers for th Sadly, I don't think my fancy rainbox text will work with the badge component hogging it's spot. If I want rainbow usernames, I'll need to code a hybrid component... +Edit: I've added a [badge list page](/badges/list) for easy perusal. \ No newline at end of file diff --git a/server/badge_statistics.json b/server/badge_statistics.json index 62bd328..7c1349a 100644 --- a/server/badge_statistics.json +++ b/server/badge_statistics.json @@ -3,30 +3,30 @@ "filename": "alpha_tester.png", "description": "Awarded to everyone who joined before or on the 7th of June, 2019 (AEST).", "visible": true, - "earnable": false + "unlockable": false }, "Capture The Flag": { "filename": "capture_the_flag.png", - "description": "This badge is stolen by successful attacks.", + "description": "This badge is stolen by successful attacks. It is automatically set as your active badge, and you can't change it until it is lost; it also sets your name to yellow, so everyone knows you have it. Only one exists.", "visible": true, - "earnable": true + "unlockable": null }, "Combat Master": { "filename": "combat_master.png", "description": "You have successfully attacked 100 times.", "visible": true, - "earnable": true + "unlockable": null }, "Gold Horde": { "filename": "gold_horde.png", "description": "You purchased this badge for 500 gold.", "visible": true, - "earnable": true + "unlockable": null }, "King Of The Hill": { "filename": "king_of_the_hill.png", "description": "You held your position at the top of the game ladder for a whole day.", "visible": true, - "earnable": true + "unlockable": null } } \ No newline at end of file diff --git a/src/components/app.jsx b/src/components/app.jsx index be55400..3ceceed 100644 --- a/src/components/app.jsx +++ b/src/components/app.jsx @@ -71,6 +71,7 @@ export default class App extends React.Component {{this.state.warning}
+Click on your favourite badge!
+Click on your favourite badge! Full list here.
Loading badges...
+ ); + } + + return ( +{this.state.data.statistics[name].description}
+Unlockable: {this.state.data.statistics[name].unlockable ? Yes : this.state.data.statistics[name].unlockable === null ? Coding Incomplete : No}
+{this.props.children}
+{this.props.children}