full early game polished up, flavor text now properly capitalizes names

app/pylocal/actions.py

@@ -12,8 +12,14 @@ def dice_roll(min=0, max=100, modifiers=[]):
     
     return result
 
-@core.app.route("/act/steal/<resource>", methods=["POST"])
+@core.app.route("/act/steal/<resource>/<target>", methods=["POST"])
-def steal_resource(resource):
+def steal_resource(resource, target):
     return flask.Response(json.dumps({
         "success": (dice_roll() >= 50)
+    }), status=200, content_type="application/json")
+
+@core.app.route("/act/recruit", methods=["POST"])
+def recruit():
+    return flask.Response(json.dumps({
+        "success": (dice_roll() >= 65)
     }), status=200, content_type="application/json")

app/pylocal/desktop.py

@@ -5,7 +5,8 @@ from . import core
 path_storagedir = pathlib.Path()
 
 class JS_API:
-    debug_mode = False
+    def __init__(self):
+        self.debug_mode = False
 
     def load_data(self, key):
         if not (path_storagedir / key).exists():

app/pylocal/tick.py

@@ -24,6 +24,7 @@ tick_event_list = []
 tick_event_list.append(TickEvent(0, 16, "XYZZY"))       # nothing happens
 tick_event_list.append(TickEvent(1, 1, "FLAVOR"))       # procedurally generated event of no consequence
 tick_event_list.append(TickEvent(10, 2, "ENCHUMAN"))    # encounter: human
+tick_event_list.append(TickEvent(11, 2, "ENCGULL"))
 
 @core.app.route("/tick")
 def tick():
@@ -50,6 +51,13 @@ def tick():
                 "food": items.generate_item_list("food", "humans", 0, 2),
                 "shinies": items.generate_item_list("shinies", "humans", 0, 2)
             }
+        case 11: # ENCGULL
+            result["items"] = {
+                # TODO: read ranges from XML rule files
+                "food": items.generate_item_list("food", "seagulls", 0, 2),
+                "shinies": items.generate_item_list("shinies", "seagulls", 0, 2)
+            }
+            result["recruit_cost"] = round(random.uniform(0, 10), 2)
         case _:
             core.log.warning("undefined tick: {0}".format(result["event_type"]))
 

app/rant/flavor.rant

@@ -1,9 +1,14 @@
 @require "wordlist"
 
+[$title: str] @text {
+    <$split_str = [split: <str>]>
+    [cat: [upper: <split_str/0>] [lower: [join: <split_str/1..>]]]
+}
+
 {
     You meet {
         a `[pick: <wordlist/nouns/birds>] |
-        `{
+        [title: `{
             [pick: <wordlist/names/people/butlers>] |
             [pick: <wordlist/names/people/computing>] |
             [pick: <wordlist/names/people/founders>] |
@@ -12,7 +17,7 @@
             [pick: <wordlist/names/surnames/english>] |
             [pick: <wordlist/names/surnames/irish>] |
             [pick: <wordlist/names/surnames/scottish>]
-        } the `[pick: <wordlist/nouns/birds>]
+        }] the `[pick: <wordlist/nouns/birds>]
     }. {
         It completely ignores you. |
         You have a polite conversation about birdly affairs. |

app/rant/food/seagulls.rant

@@ -0,0 +1,55 @@
+@require "wordlist"
+[$desc_food] @text {
+    {
+        [pick: <wordlist/adjectives/food>] @weight 1.25 |
+        [pick: <wordlist/adjectives/taste>] @weight 1.1 |
+        [pick: <wordlist/names/cities/united_states>] @weight 1.1 |
+        [pick: <wordlist/names/cities/canada>] @weight 0.9 |
+        [pick: <wordlist/names/cities/spain>] @weight 0.75 |
+        [pick: <wordlist/names/cities/alpha>] @weight 0.5 |
+        { # stuffed/filled/covered
+            `{
+                [pick: <wordlist/nouns/fruit>] @weight 1 |
+                [pick: <wordlist/nouns/meat>] @weight 1 |
+                [pick: <wordlist/nouns/food>] @weight 1 |
+                [pick: <wordlist/nouns/cheese>] @weight 1 |
+                [pick: <wordlist/nouns/condiments>] @weight 1 |
+                [pick: <wordlist/nouns/music_theory>] @weight 0.5 |
+                [pick: <wordlist/nouns/music_production>] @weight 0.5 |
+                [pick: <wordlist/nouns/set_theory>] @weight 0.25 |
+                [pick: <wordlist/nouns/ghosts>] @weight 0.33 |
+                [pick: <wordlist/nouns/web_development>] @weight 0.25
+            } `{stuffed|filled|covered|dipped|coated}
+        } @weight 1 # stuffed/filled/covered
+    }
+}
+
+[$get_entree] @text {
+    {
+        [pick: <wordlist/nouns/food>] |
+        [pick: <wordlist/nouns/fast_food>]
+    }
+}
+
+##
+[$mod_order] @text {
+    {
+        add | no | sub | extra |
+        half | left | right | side
+    } `{
+        [pick: <wordlist/nouns/condiments>] |
+        [pick: <wordlist/nouns/cheese>] |
+        [pick: <wordlist/nouns/food>] |
+        [pick: <wordlist/nouns/seasonings>] |
+        [pick: <wordlist/nouns/plants>]
+    }
+}
+##
+
+{
+    a piece of `[pick: <wordlist/nouns/cheese>] cheese |
+    part of a `{
+        [if: [maybe]{[desc_food]}] [get_entree] |
+        [pick: <wordlist/nouns/fruit>]
+    }
+}

app/rant/shinies/seagulls.rant

@@ -0,0 +1,4 @@
+{
+    a watch |
+    a bracelet
+}

static/js/seagull.js

@@ -93,6 +93,9 @@ function update_ui() {
     page_elements["lbl_class"].innerHTML = gamestate["class"];
     page_elements["lbl_xp"].innerHTML = gamestate["xp"];
     page_elements["lbl_xp_next"].innerHTML = gamestate["xp_next"];
+    page_elements["lbl_level"].innerHTML = gamestate["level"];
+    page_elements["menu_enc_human"].value = gamestate["enc_human"];
+    page_elements["menu_enc_seagull"].value = gamestate["enc_seagull"];
 }
 
 var dev_toolbox_open = false;
@@ -128,18 +131,32 @@ function reward_xp(amount) {
     }
 }
 
-async function steal_resource(resource, amount, itemstr) {
+async function steal_resource(resource, target, amount, itemstr) {
     var items = itemstr.split(",")
-    var stealdata = await fetch("/act/steal/" + resource, {method: "POST", body: JSON.stringify({gamestate: gamestate})})
+    var stealdata = await fetch(`/act/steal/${resource}/${target}`, {method: "POST", body: JSON.stringify({gamestate: gamestate})})
     .then(res => { return res.json(); })
     .catch(e => { throw e; });
 
     if (stealdata["success"] && amount > 0) {
         gamestate[resource] += amount;
         reward_xp(2);
-        record_log("Stole " + resource + " from a human: " + items.join(", "));
+        record_log(`Stole ${resource} from a ${target}: ${items.join(", ")}`);
     }
-    else { record_log("Didn't steal " + resource + " from a human"); }
+    else { record_log(`Didn't steal ${resource} from a ${target}`); }
+}
+
+async function recruit(amount) {
+    var stealdata = await fetch("/act/recruit", {method: "POST", body: JSON.stringify({gamestate: gamestate})})
+    .then(res => { return res.json(); })
+    .catch(e => { throw e; });
+
+    if (stealdata["success"] && amount > 0) {
+        gamestate["shinies"] -= amount;
+        reward_xp(5);
+        gamestate["colony"] += 1;
+        record_log("Successfully recruited a seagull into the colony");
+    }
+    else { record_log("The other gull wasn't impressed. Recruiting failed."); }
 }
 
 async function game_tick() {
@@ -193,24 +210,83 @@ async function game_tick() {
                 logstring += "</ol>\nWhat would you like to do?";
 
                 record_log_with_choices(logstring, 
-                    "Steal food", `steal_resource('food', ${total_food}, "${food_descs.toString()}")`,
+                    "Steal food", `steal_resource('food', 'humans', ${total_food}, "${food_descs.toString()}")`,
-                    "Steal shinies", `steal_resource('shinies', ${total_shinies}, "${shinies_descs.toString()}")`
+                    "Steal shinies", `steal_resource('shinies', 'humans', ${total_shinies}, "${shinies_descs.toString()}")`
                 )
 
                 break;
             case "steal-food":
+                record_log("You have encountered a human. Attempting to steal food.");
                 tickdata.items.food.forEach((item) => {
                     total_food += item["amount"];
                     food_descs.push(item["desc"]);
                 })
-                steal_resource("food", total_food, food_descs.toString());
+                steal_resource("food", "humans", total_food, food_descs.toString());
                 break;
             case "steal-shinies":
+                record_log("You have encountered a human. Attempting to steal shinies.");
                 tickdata.items.shinies.forEach((item) => {
                     total_shinies += item["amount"];
                     shinies_descs.push(item["desc"]);
                 })
-                steal_resource("shinies", total_shinies, shinies_descs.toString());
+                steal_resource("shinies", "humans", total_shinies, shinies_descs.toString());
+                break;
+            default:
+                console.error("undefined action " + page_elements["menu_enc_human"]);
+                break;
+        }
+    } else if (tickdata["event_type"] == 11) { // ENCGULL
+        var total_food = 0;
+        var food_descs = [];
+        var total_shinies = 0;
+        var shinies_descs = [];
+
+        switch (page_elements["menu_enc_seagull"].value) {
+            case "pause":
+                tickdata.items.food.forEach((item) => {
+                    total_food += item["amount"];
+                    food_descs.push(item["desc"]);
+                });
+                tickdata.items.shinies.forEach((item) => {
+                    total_shinies += item["amount"];
+                    shinies_descs.push(item["desc"]);
+                });
+
+                var logstring = "You have encountered a seagull. It is carrying these resources:\n\n"
+                logstring += "<ol>\n"
+                if (total_food > 0) {
+                    logstring += `<li><b>${total_food.toFixed(2)} food:</b> ${food_descs.join(", ")}</li>\n`;
+                }
+                if (total_shinies > 0) {
+                    logstring += `<li><b>${total_shinies.toFixed(2)} shinies:</b> ${shinies_descs.join(", ")}</li>\n`;
+                }
+                logstring += "</ol>\nWhat would you like to do?";
+
+                record_log_with_choices(logstring, 
+                    "Recruit", `recruit(${tickdata.recruit_cost})`,
+                    "Steal food", `steal_resource('food', 'seagulls', ${total_food}, "${food_descs.toString()}")`,
+                    "Steal shinies", `steal_resource('shinies', 'seagulls', ${total_shinies}, "${shinies_descs.toString()}")`
+                )
+
+                break;
+            case "recruit":
+                recruit(tickdata.recruit_cost);
+                break
+            case "steal-food":
+                record_log("You have encountered a seagull. Attempting to steal food.");
+                tickdata.items.food.forEach((item) => {
+                    total_food += item["amount"];
+                    food_descs.push(item["desc"]);
+                })
+                steal_resource("food", "seagulls", total_food, food_descs.toString());
+                break;
+            case "steal-shinies":
+                record_log("You have encountered a seagull. Attempting to steal shinies.");
+                tickdata.items.shinies.forEach((item) => {
+                    total_shinies += item["amount"];
+                    shinies_descs.push(item["desc"]);
+                })
+                steal_resource("shinies", "seagulls", total_shinies, shinies_descs.toString());
                 break;
             default:
                 console.error("undefined action " + page_elements["menu_enc_human"]);
@@ -244,6 +320,9 @@ else {
     target = document;
 }
 
+function update_action(enc, value) {
+    gamestate[`enc_${enc}`] = value;
+}
 
 target.addEventListener(start_event, function (ev) {
     page_elements["div_log"] = document.querySelector("#main-log");
@@ -259,9 +338,13 @@ target.addEventListener(start_event, function (ev) {
     page_elements["lbl_tick"] = document.querySelector("#main-day-counter");
     page_elements["lbl_xp"] = document.querySelector("#lbl-seagull-xp-current");
     page_elements["lbl_xp_next"] = document.querySelector("#lbl-seagull-xp-next");
+    page_elements["lbl_level"] = document.querySelector("#lbl-seagull-lvl");
     page_elements["menu_enc_human"] = document.querySelector("#menu-enc-human");
     page_elements["menu_enc_seagull"] = document.querySelector("#menu-enc-seagull");
 
+    page_elements["menu_enc_human"].addEventListener("change", (ev) => {update_action("human", ev.target.value)})
+    page_elements["menu_enc_seagull"].addEventListener("change", (ev) => {update_action("seagull", ev.target.value)})
+
     prepare_gamestate();
 
     record_log("seagull game ver. " + ver_string);