Make Civet live

JRaspass · JRaspass · commit ab98914322a6 · 2024-08-03T02:33:16.000+01:00
Closes #1087
diff --git a/config/data/cheevos.toml b/config/data/cheevos.toml
@@ -87,7 +87,7 @@ target      = 3
 [['Hole/Lang Specific']]
 name        = 'Caffeinated'
 emoji       = '☕'
-description = 'Solve any hole in both Java and JavaScript.'
+description = 'Solve any hole in any two of Civet, Java, or JavaScript.'
 
 [['Hole/Lang Specific']]
 name        = 'COBOWL'
diff --git a/config/data/langs.toml b/config/data/langs.toml
@@ -287,11 +287,10 @@ int main(int argc, char* argv[]) {
 '''
 
 [Civet]
-experiment = 1087
-size       = '65.8 MiB'
-version    = '0.7.19'
-website    = 'https://civet.dev'
-example    = '''
+size    = '65.8 MiB'
+version = '0.7.19'
+website = 'https://civet.dev'
+example = '''
 // Printing
 console.log 'Hello, World!'
 
diff --git a/sql/a-schema.sql b/sql/a-schema.sql
@@ -63,12 +63,12 @@ CREATE TYPE keymap AS ENUM ('default', 'vim');
 
 CREATE TYPE lang AS ENUM (
     'assembly', 'awk', 'bash', 'basic', 'berry', 'brainfuck', 'c', 'c-sharp',
-    'clojure',  'cpp', 'cobol', 'coconut', 'crystal', 'd', 'dart', 'elixir',
-    'f-sharp', 'factor', 'fish', 'forth', 'fortran', 'go', 'golfscript',
-    'haskell', 'hexagony', 'j', 'janet', 'java', 'javascript', 'julia', 'k',
-    'lisp', 'lua', 'nim', 'ocaml', 'pascal', 'perl', 'php', 'powershell',
-    'prolog', 'python', 'r', 'raku', 'rockstar', 'ruby', 'rust', 'sed', 'sql',
-    'swift', 'tcl', 'tex', 'v', 'viml', 'wren', 'zig'
+    'civet', 'clojure',  'cpp', 'cobol', 'coconut', 'crystal', 'd', 'dart',
+    'elixir', 'f-sharp', 'factor', 'fish', 'forth', 'fortran', 'go',
+    'golfscript', 'haskell', 'hexagony', 'j', 'janet', 'java', 'javascript',
+    'julia', 'k', 'lisp', 'lua', 'nim', 'ocaml', 'pascal', 'perl', 'php',
+    'powershell', 'prolog', 'python', 'r', 'raku', 'rockstar', 'ruby', 'rust',
+    'sed', 'sql', 'swift', 'tcl', 'tex', 'v', 'viml', 'wren', 'zig'
 );
 
 CREATE TYPE medal AS ENUM ('unicorn', 'diamond', 'gold', 'silver', 'bronze');
diff --git a/sql/b-earn-cheevos.sql b/sql/b-earn-cheevos.sql
@@ -67,7 +67,9 @@ BEGIN
         earned := earn(earned, 'bird-is-the-word', user_id); END IF;
 
     -- ☕ Caffeinated
-    IF langs_for_hole @> '{java,javascript}' THEN
+    SELECT COUNT(*) >= 2 INTO found FROM UNNEST(langs_for_hole)
+     WHERE unnest IN ('civet', 'java', 'javascript');
+    IF found THEN
         earned := earn(earned, 'caffeinated', user_id); END IF;
 
     -- 🎳 COBOWL
diff --git a/t/cheevos.t b/t/cheevos.t
@@ -87,9 +87,9 @@ is $dbh.execute(
 for $dbh.execute('SELECT unnest(enum_range(null::lang))').allrows.flat {
     my $earns = %langs{ my $i = ++$ } // '{}';
 
-    # Add hole-specific cheevos on the end.
+    # Add hole-specific cheevos on the front.
     $earns.=subst: '{', '{sounds-quite-nice,' if $_ eq 'd';
-    $earns.=subst: '{', '{caffeinated,'       if $_ eq 'javascript';
+    $earns.=subst: '{', '{caffeinated,'       if $_ eq 'java';
     $earns.=subst: '{', '{go-forth,'          if $_ eq 'go';
     $earns.=subst: '{', '{just-kidding,'      if $_ eq 'k';
     $earns.=subst: '{', '{tim-toady,'         if $_ eq 'raku';
