Merge branch 'master' into feat/logging

bismuthsoft · Sep 19, 2024 · f2f3801 · f2f3801
2 parents e1fc76a + 9c4ba54
commit f2f3801
Show file tree

Hide file tree

Showing 5 changed files with 6,020 additions and 5,079 deletions.
diff --git a/src/actors/killer-tomato.fnl b/src/actors/killer-tomato.fnl
@@ -36,7 +36,8 @@
 
 (fn kt.on-death [s actor]
   (when (< (love.math.random) 0.2)
-    (dungeon.spawn-actor s :tomato actor.pos
-        (dungeon.log (.. "The Killer Tomato became docile!")))))
+    (do
+      (dungeon.spawn-actor s :tomato actor.pos)
+      (dungeon.log "The Killer Tomato became docile!"))))
 
 kt
diff --git a/src/actors/tomato.fnl b/src/actors/tomato.fnl
@@ -1,7 +1,7 @@
 (local tomato {})
 
 (fn tomato.spawn [s pos]
-  {: kind
+  {:kind "tomato"
    :name "tomato"
    : pos
    :color [1 0 0]