diff --git a/acks/npc/templates/generate_npc_party.html b/acks/npc/templates/generate_npc_party.html index 5691e9b..14c3a5c 100644 --- a/acks/npc/templates/generate_npc_party.html +++ b/acks/npc/templates/generate_npc_party.html @@ -153,7 +153,9 @@ {% endfor %} - +{% else %} +
+
{% endif %}
diff --git a/acks/static/PalismaContinent.png b/acks/static/PalismaContinent.png new file mode 100644 index 0000000..64ebd6f Binary files /dev/null and b/acks/static/PalismaContinent.png differ diff --git a/acks/static/PalismaWorld.png b/acks/static/PalismaWorld.png new file mode 100644 index 0000000..25ad5be Binary files /dev/null and b/acks/static/PalismaWorld.png differ diff --git a/acks/static/home_image.jpg b/acks/static/home_image.jpg new file mode 100644 index 0000000..8566f34 Binary files /dev/null and b/acks/static/home_image.jpg differ diff --git a/acks/templates/base.html b/acks/templates/base.html index 66bd6b2..1c6a61a 100644 --- a/acks/templates/base.html +++ b/acks/templates/base.html @@ -1,7 +1,7 @@ {% set navigation_bar = [ ('/', 'index', 'Home'), ('/handbook', 'handbook', 'Handbook'), - ('/worldmap', 'worldmap', 'World Map'), + ('/worldmap', 'worldmap', 'Maps'), ('.header', 'generate', 'Generate'), ('.header', 'other', 'Other'), ('/npc/spells', 'spells', 'Spells'), @@ -42,56 +42,62 @@
-
-
-
    - {% for href, id, label in navigation_bar %} - {% if href == '.header' %} -
  • {{ label|e }}
    • - {% if id == 'generate' %} - {% for ghref, gid, glabel in generation_bar %} +
    +
    +
      + {% for href, id, label in navigation_bar %} + {% if href == '.header' %} +
    • {{ label|e }}
      • + {% if id == 'generate' %} + {% for ghref, gid, glabel in generation_bar %}
    • {{ glabel|e }}
      • - {% endfor %} - {% endif %} - {% else %} + {% endfor %} + {% endif %} + {% else %}
    • - {{ label|e }} + {{ label|e }}
      • - {% endif %} - {% endfor %} -
    + {% endif %} + {% endfor %} +
+
-
-
- {% block content %}{% endblock %} +
+ {% block content %}{% endblock %}
+ diff --git a/acks/templates/index.html b/acks/templates/index.html index 1ac2c2e..939bd69 100644 --- a/acks/templates/index.html +++ b/acks/templates/index.html @@ -6,6 +6,26 @@

Adventurer Conqueror KingHome

+
+
+

+ Welcome to the Adventurer Conqueror King toolkit for the Legends of Palisma campaign. + You've had a long journey... three months aboard a ship to reach the new continent, + many thousands of miles across the Immortal Sea from Branborne and any sense of familiarity. +

+

+ What adventures await you in an age when empires totter on the brink of war, and terrible + monsters tear at the fragile borderlands of men; when decaying cities teem with chaos and + corruption, where nubile maidens are sacrificed to chthonic cults and nobles live in + decadent pleasure on the toil of slaves; when heroes, wizards, and rogues risk everything + in pursuit of glory, fortune, and power. These are days when adventurers can become + conquerors… and conquerors can become kings! +

+ +
+ +
+
{% endblock %} {% block head %} diff --git a/acks/templates/worldmap.html b/acks/templates/worldmap.html index 0a937da..ac4ef38 100644 --- a/acks/templates/worldmap.html +++ b/acks/templates/worldmap.html @@ -1,14 +1,23 @@ {% extends "base.html" %} {% set active_page = "worldmap" %} -{% block title %}World Map{% endblock %} +{% block title %}Maps{% endblock %} {% block content %}
-

Adventurer Conqueror KingWorld Map

+

Adventurer Conqueror KingMaps


-
- +
+ +
    +
    • +
    • +
    • +
{% endblock %} diff --git a/acks/views.py b/acks/views.py index 02a7e66..b9fbe2d 100644 --- a/acks/views.py +++ b/acks/views.py @@ -1,5 +1,3 @@ -import requests -from lxml import html from flask import current_app, Blueprint, render_template, url_for, redirect @@ -17,15 +15,15 @@ def handbook(): def worldmap(): return render_template('worldmap.html') -@default_views.route('/treasure') -@default_views.route('/treasure/') +#@default_views.route('/treasure') +#@default_views.route('/treasure/') def treasure(treasure_type=None): + # import requests + # from lxml import html # Unused, we can't tap into Autarch's generator, so just link to a new tab # in navigation bar now - ''' if treasure_type is not None: with requests.Session() as s: - import pudb;pu.db # First grab the page to pull a fresh form_build_id treasure_page = s.get('http://autarch.co/treasure') dom_tree = html.fromstring(treasure_page.content) @@ -42,5 +40,4 @@ def treasure(treasure_type=None): print("TG Response: {}, Payload: {}".format(response.text, payload)) generated_treasure = response.json()[1]["data"].replace('class="form-textarea"', 'class="uk-textarea"') return render_template('treasure.html', generated_treasure=generated_treasure, treasure_type=treasure_type) - ''' return render_template('treasure.html')