k=k, new weapons

deilann · Sep 30, 2023 · a316c6d · a316c6d
1 parent aaf45a4
commit a316c6d
Show file tree

Hide file tree

Showing 7 changed files with 38 additions and 13 deletions.
diff --git a/data/kData.json b/data/kData.json
@@ -246,8 +246,40 @@
             "alt": "A rose on a cream background with illegible words taken from a postcard of James Whitcomb Riley poem.",
             "credit": "<a href=\"https://commons.wikimedia.org/wiki/File:Postcard_of_James_Whitcomb_Riley_poem,_Riley_roses_-_DPLA_-_f2ce633297b0eb860dd817d9a9630936_(page_1).jpg\">Indiana State Library and Historical Bureau</a>, Public domain, via Wikimedia Commons" 
 
-          }
+          },
+
+          {
+            "name": "feedback",
+            "attack":
+                {
+                    "past": "criticized",
+                    "present": "criticize",
+                    "pastpart": "criticized",
+                    "prespart": "criticizing"
+                },
+            "strength": "valuable",
+            "weakness": "subjective",
+            "image": "url('../images/k/feedback.png')",
+            "alt": "Two little cartoon squares holding feedback signs.",
+            "credit": "<a href=\"https://commons.wikimedia.org/wiki/File:Feedback_(Pixelchen).png\">SynLLOER</a>, CC0, via Wikimedia Commons"
+        },
+
+        {
+          "name": "pizza",
+          "attack":
+              {
+                  "past": "lava cheesed",
+                  "present": "lava cheese",
+                  "pastpart": "lava cheese",
+                  "prespart": "lava cheesing"
+              },
+          "strength": "saucy",
+          "weakness": "temporary",
+          "image": "url('../images/k/pizza.png')",
+          "alt": "A Pizza Quattro Stagioni seen from slightly above.",
+          "credit": "<a href=\"https://commons.wikimedia.org/wiki/File:Pizza_Quattro_Stagioni_transparent.png\">Florian838</a>, CC0, via Wikimedia Commons"
+      }
 
     ]
 
-}
+}
diff --git a/data/kData_empty.json b/data/kData_empty.json
@@ -2,25 +2,18 @@
     "weapons": [
         {
             "name": "",
-            "attack": [
+            "attack":
                 {
                     "past": "",
                     "present": "",
                     "pastpart": "",
                     "prespart": ""
-                }
-            ],
+                },
             "strength": "",
             "weakness": "",
             "image": "",
             "alt": "",
             "credit": ""
         }
-    ],
-
-    "outcomes": [
-        {
-            "outcome":""
-        }
     ]
 }
diff --git a/images/k/feedback.png b/images/k/feedback.png
diff --git a/images/k/pizza.png b/images/k/pizza.png
diff --git a/k-graphing/k.html b/k-graphing/k.html
@@ -12,6 +12,7 @@ <h1>k = <span class="k-modifiers" id="k-display"></span></h1>
             <div class="k-buttons" id="k-buttons-container">
             <button onclick="kPlusPlus()" class="modifier" id="kPlus">k++</button>
             <button onclick="kZero()" class="modifier" id="kZero">k=0</button>
+            <button onclick="populate()" class="modifier" id="sameK">k=k</button>
             <button onclick="kMinusMinus()" class="modifier" id="kMinus">k--</button>
             </div>
         </div>

diff --git a/k-graphing/kApp.js b/k-graphing/kApp.js
@@ -53,7 +53,7 @@ function kPlusPlus() {
 }
 
 function kMinusMinus() {
-    if (k < 2) {
+    if (k < 1) {
         choiceHead.innerHTML += ' NO '
     } else {
         k.minusMinus()

diff --git a/k-graphing/words.txt b/k-graphing/words.txt
@@ -1,4 +1,3 @@
-poem
 feedback
 pizza
 efficiency