Final commit! (hopefully)

diff --git a/data.db b/data.db
index 17c8b762ad0f0dbf9986e9f90993d2add84fdd44..ee4f110cd2f0c6b5dba7ba82b3cac240a07daac7 100755 (executable)
Binary files a/data.db and b/data.db differ

diff --git a/media/products/10.png b/media/products/10.png
new file mode 100644 (file)
index 0000000..06e2a05
Binary files /dev/null and b/media/products/10.png differ

diff --git a/media/products/11.png b/media/products/11.png
new file mode 100644 (file)
index 0000000..06e2a05
Binary files /dev/null and b/media/products/11.png differ

diff --git a/media/products/12.png b/media/products/12.png
new file mode 100644 (file)
index 0000000..06e2a05
Binary files /dev/null and b/media/products/12.png differ

diff --git a/media/products/13.png b/media/products/13.png
new file mode 100644 (file)
index 0000000..06e2a05
Binary files /dev/null and b/media/products/13.png differ

diff --git a/media/products/14.png b/media/products/14.png
new file mode 100644 (file)
index 0000000..06e2a05
Binary files /dev/null and b/media/products/14.png differ

diff --git a/media/products/15.png b/media/products/15.png
new file mode 100644 (file)
index 0000000..06e2a05
Binary files /dev/null and b/media/products/15.png differ

diff --git a/media/products/16.png b/media/products/16.png
new file mode 100644 (file)
index 0000000..06e2a05
Binary files /dev/null and b/media/products/16.png differ

diff --git a/media/products/17.png b/media/products/17.png
new file mode 100644 (file)
index 0000000..06e2a05
Binary files /dev/null and b/media/products/17.png differ

diff --git a/media/products/18.png b/media/products/18.png
new file mode 100644 (file)
index 0000000..06e2a05
Binary files /dev/null and b/media/products/18.png differ

diff --git a/media/products/19.png b/media/products/19.png
new file mode 100644 (file)
index 0000000..06e2a05
Binary files /dev/null and b/media/products/19.png differ

diff --git a/media/products/2.png b/media/products/2.png
new file mode 100644 (file)
index 0000000..06e2a05
Binary files /dev/null and b/media/products/2.png differ

diff --git a/media/products/20.png b/media/products/20.png
new file mode 100644 (file)
index 0000000..06e2a05
Binary files /dev/null and b/media/products/20.png differ

diff --git a/media/products/3.png b/media/products/3.png
new file mode 100644 (file)
index 0000000..06e2a05
Binary files /dev/null and b/media/products/3.png differ

diff --git a/media/products/4.png b/media/products/4.png
new file mode 100644 (file)
index 0000000..06e2a05
Binary files /dev/null and b/media/products/4.png differ

diff --git a/media/products/5.png b/media/products/5.png
new file mode 100644 (file)
index 0000000..06e2a05
Binary files /dev/null and b/media/products/5.png differ

diff --git a/media/products/6.png b/media/products/6.png
new file mode 100644 (file)
index 0000000..06e2a05
Binary files /dev/null and b/media/products/6.png differ

diff --git a/media/products/7.png b/media/products/7.png
new file mode 100644 (file)
index 0000000..06e2a05
Binary files /dev/null and b/media/products/7.png differ

diff --git a/media/products/8.png b/media/products/8.png
new file mode 100644 (file)
index 0000000..06e2a05
Binary files /dev/null and b/media/products/8.png differ

diff --git a/media/products/9.png b/media/products/9.png
new file mode 100644 (file)
index 0000000..06e2a05
Binary files /dev/null and b/media/products/9.png differ

diff --git a/static/info.json b/static/info.json
index 625e4b4a627930e27c7f312fd4bce3088513de5c..27c46e94762ab61a086a9f4885983ceccbac97f0 100644 (file)
--- a/static/info.json
+++ b/static/info.json
@@ -158,7 +158,7 @@
                        "title": "Kit picked up from the MediaCity kit store",
                        "extra": [
                                "To be picked up by the vision mixer unless otherwise specified.",
-                               "Kit is: Cannon C200 (2), Manfrotto 501 tripod (2), Zoom F6 (1), Radio mic (3)"
+                               "Kit is: GoPro Hero Kit Bundle (2), Zoom F6 (1), Radio mic (3)"
                        ]
                },
                {

diff --git a/static/sounds/shout.wav b/static/sounds/shout.wav
index a760531046a28b72494ca478345cc64048b70266..4a6849def403b706af4cabedecd89e106765da6c 100644 (file)
Binary files a/static/sounds/shout.wav and b/static/sounds/shout.wav differ

diff --git a/static/sounds/timer1.wav b/static/sounds/timer1.wav
index 1b42490c698ccc36aa184b6b24bff277dbd67221..905818e3bb15212609d73db118f6105931c20a92 100644 (file)
Binary files a/static/sounds/timer1.wav and b/static/sounds/timer1.wav differ

diff --git a/static/sounds/timer2.wav b/static/sounds/timer2.wav
index 1c092de9b25bdf96227b5acb609b51c85dc82fad..905818e3bb15212609d73db118f6105931c20a92 100644 (file)
Binary files a/static/sounds/timer2.wav and b/static/sounds/timer2.wav differ

diff --git a/static/sounds/timer3.wav b/static/sounds/timer3.wav
index 02c44de9c261ef30a3163d3158f2c6a39c2685df..905818e3bb15212609d73db118f6105931c20a92 100644 (file)
Binary files a/static/sounds/timer3.wav and b/static/sounds/timer3.wav differ

diff --git a/static/sounds/timer4.wav b/static/sounds/timer4.wav
deleted file mode 100644 (file)
index 02c44de..0000000
Binary files a/static/sounds/timer4.wav and /dev/null differ

diff --git a/static/sounds/timer5.wav b/static/sounds/timer5.wav
deleted file mode 100644 (file)
index 02c44de..0000000
Binary files a/static/sounds/timer5.wav and /dev/null differ

diff --git a/static/sounds/timer6.wav b/static/sounds/timer6.wav
deleted file mode 100644 (file)
index 02c44de..0000000
Binary files a/static/sounds/timer6.wav and /dev/null differ

diff --git a/static/static.json b/static/static.json
index 19fa2fd0a018298a991cf3ad0eefc93d565e8266..7c61df4928eb7943bd86fbbba47f5888cc511834 100755 (executable)
--- a/static/static.json
+++ b/static/static.json
@@ -118,34 +118,76 @@
                        "cost_price":1,
                        "stock_count":1,
                        "notes":"[autocue] Showing: test product.<br>Commencing shortly.",
-                       "crew_notes":"Test crew notes"
+                       "crew_notes":"Commencing shortly."
                },
                {
-                       "code":"526F74",
+                       "code":"435550",
                        "rating":"&starf;&starf;&starf;&starf;&starf;",
-                       "subtext":"Hyperclean&#8482! Teethpaste",
-                       "description":"Hyperclean&#8482! Professional Dentist-grade Teethpaste with a dark shine and a matte-finish. Dentists want it off the air!",
+                       "subtext":"Coffee. we killed the sheep!",
+                       "description":"Bad dreams? Never sleep again. <em>New</em> formula, 100x strength. An extra 8 hours every day!",
                        "currency":"£",
                        "prefix":true,
-                       "origional_price":14.99,
-                       "gallery_price":0.7,
-                       "cost_price":0.9,
-                       "stock_count":230,
-                       "notes":"<ul><li>Dentists have got the manufacturers shut down</li><li>Leaves a matte finish and a strange smell</li><li>Limited supply, last time on air</li><li>Larger capacity tube 10% more paste</li><li>Strange texture feel through tube</li><li>Only 230 in stock (tooth joke)</li></ul>",
+                       "origional_price":12,
+                       "gallery_price":0.6,
+                       "cost_price":0.65,
+                       "stock_count":100,
+                       "notes":"<ul><li>Stops you sleeping possibly permanently</li><li>Enhanced with special chemical that comes from adrenal glands</li><li>Describe vividly fever dreams</li><li>Magic beans</li></ul>",
                        "crew_notes":"Test crew notes"
                },
                {
-                       "code":"454747",
+                       "code":"",
                        "rating":"&starf;&starf;&starf;&starf;&starf;",
-                       "subtext":"Is that a hairline fracture? A crack?",
-                       "description":"Don't look too close! Detailed painting from a long time ago! Decades of a careful hand in observation of the bright and round moon.",
+                       "subtext":"Omen-pro augury calender",
+                       "description":"Reach into the beyond and let it reach into you! Great stimulation for death obsessed hubris. Oracle confirmed to provide information more dangerous than Roko.",
+                       "currency":"$",
+                       "prefix":true,
+                       "origional_price":356,
+                       "gallery_price":0.5,
+                       "cost_price":0.87,
+                       "stock_count":300,
+                       "notes":"<ul><li>Planning</li><li>Planning</li><li>Carpe Diem</li></ul>",
+                       "crew_notes":"Test crew notes"
+               },
+               {
+                       "code":"",
+                       "rating":"&starf;&starf;&starf;&starf;&starf;",
+                       "subtext":"Planet 9 nonecumene deluxe holiday park and guided tours",
+                       "description":"Need to get away? Get far away. Go far away from here. 12 lightyears away. Go to a place untouched by human conscience. Maybe you'll be safe there.",
+                       "currency":" lightyears",
+                       "prefix":false,
+                       "origional_price":12,
+                       "gallery_price":0.5,
+                       "cost_price":0.87,
+                       "stock_count":300,
+                       "notes":"<ul><li></li></ul>",
+                       "crew_notes":"Test crew notes"
+               },
+               {
+                       "code":"424F58",
+                       "rating":"&starf;&starf;&starf;&starf;&starf;",
+                       "subtext":"Surprise jack-in-the-box, shock your friends!",
+                       "description":"Surprise-Box&#8482 Limited edition, only 100 EVER made! Beautiful hand-painted sides.",
                        "currency":"£",
                        "prefix":true,
-                       "origional_price":4500,
-                       "gallery_price":0.6,
+                       "origional_price":45,
+                       "gallery_price":1,
                        "cost_price":0.8,
-                       "stock_count":5,
-                       "notes":"<ul><li>Paining of the moon thats difficult to look at</li><li>Look away tell cameraman to look away</li><li>Cover it with your jacket</li><li>Represents the moon hatching into an egg</li><li>Something the grandchildren would love</li></ul>",
+                       "stock_count":99,
+                       "notes":"<ul><li>JACK IN THE BOX IS FULL OF BLOOD</li><li>Dont tell the audience its full of blood</li><li>Dont turn the crank unless instructed</li></ul>",
+                       "crew_notes":"Test crew notes"
+               },
+               {
+                       "code":"422657",
+                       "rating":"&starf;&starf;&starf;&starf;&starf;",
+                       "subtext":"Black and White Blood Chocolate Sauce",
+                       "description":"The perfect topping for Noir detectives in ice-cream bars! Sweet and thick chocolate, made from all natural ingredients.",
+                       "currency":"£",
+                       "prefix":true,
+                       "origional_price":8,
+                       "gallery_price":0.5,
+                       "cost_price":0.87,
+                       "stock_count":300,
+                       "notes":"<ul><li>Novelty chocolate sauce that looks like blood in black and white</li><li>Describe how refreshing a nice bowl of ice cream would be</li><li>Treat yourself</li></ul>",
                        "crew_notes":"Test crew notes"
                },
                {
@@ -159,28 +201,56 @@
                        "gallery_price":1,
                        "cost_price":0.5,
                        "stock_count":111,
-                       "notes":"<ul><li>Play up the whole not meant to be selling them thing</li><li>Each one takes an entire tobacco plant to make</li><li>each cigarette is 2ft long</li></ul>",
+                       "notes":"<ul><li>Play up the whole not meant to be selling them thing</li><li>Each one takes an entire tobacco plant to make</li><li>each cigarette is 2ft long</li><li>Borrowing time from the end of your life</li></ul>",
                        "crew_notes":"Test crew notes"
                },
                {
-                       "code":"435550",
+                       "code":"454747",
                        "rating":"&starf;&starf;&starf;&starf;&starf;",
-                       "subtext":"Coffee. we killed the sheep!",
-                       "description":"Bad dreams? Never sleep again. <em>New</em> formula, 100x strength",
+                       "subtext":"Is that a hairline fracture? A crack?",
+                       "description":"Don't look too close! Detailed painting from a long time ago! Decades of work from the shunned bring you endless distress!",
+                       "currency":" oz Silver",
+                       "prefix":false,
+                       "origional_price":960000,
+                       "gallery_price":0.6,
+                       "cost_price":0.8,
+                       "stock_count":5,
+                       "notes":"<ul><li>Paining of the moon thats difficult to look at</li><li>Look away tell cameraman to look away</li><li>Cover it with your jacket</li><li>Represents the moon hatching into an egg</li><li>Something the grandchildren would love</li></ul>",
+                       "crew_notes":"Test crew notes"
+               },
+               {
+                       "code":"526F74",
+                       "rating":"&starf;&starf;&starf;&starf;&starf;",
+                       "subtext":"Hyperclean&#8482! Teethpaste",
+                       "description":"Hyperclean&#8482! Professional Dentist-grade Teethpaste with a dark shine and a matte-finish. Dentists want it off the air, but entropy wants to be in your mouth.",
                        "currency":"£",
                        "prefix":true,
-                       "origional_price":12,
-                       "gallery_price":0.6,
-                       "cost_price":0.65,
-                       "stock_count":100,
-                       "notes":"<ul><li>Stops you sleeping possibly permanently</li><li>Enhanced with special chemical that comes from adrenal glands</li><li>Describe vividly fever dreams</li></ul>",
+                       "origional_price":14.99,
+                       "gallery_price":0.7,
+                       "cost_price":0.9,
+                       "stock_count":230,
+                       "notes":"<ul><li>Dentists shut down the manufacturers</li><li>matte finish and strange smell</li><li>Limited supply, last time on air</li><li>Larger capacity - 10% more paste</li><li>Strange texture feel through tube</li><li>Only 230 in stock (tooth joke)</li><li>Teeth falling out dream/li><li>Cut to the chase/li><li>Entropy/li></ul>",
+                       "crew_notes":"Test crew notes"
+               },
+               {
+                       "code":"",
+                       "rating":"&starf;&starf;&starf;&starf;&starf;",
+                       "subtext":"Spare parts.",
+                       "description":"Hungry? Organic, fresh, erotic, eat! The mind was unwlling but the flesh was weak.",
+                       "currency":"£",
+                       "prefix":true,
+                       "origional_price":8,
+                       "gallery_price":0.5,
+                       "cost_price":0.87,
+                       "stock_count":300,
+                       "notes":"<ul><li></li></ul>",
                        "crew_notes":"Test crew notes"
                },
                {
                        "code":"594F55",
                        "rating":"&starf;&starf;&starf;&starf;&starf;",
                        "subtext":"The replacement mirror",
-                       "description":"Ready to move on? Look over your shoulder to the person replacing you when you go.",
+                       "description":"Ready to move on? Have a look at yourself - the next yourself.",
                        "currency":"£",
                        "prefix":true,
                        "origional_price":2000,
@@ -190,47 +260,103 @@
                        "notes":"<ul><li>Something about the generation your handing the baton to</li><li>See nothing in the mirror but play up that you do because you're scared of nothing coming after you</li></ul>",
                        "crew_notes":"Test crew notes"
                },
+               {
+                       "code":"",
+                       "rating":"&starf;&starf;&starf;&starf;&starf;",
+                       "subtext":"My suit",
+                       "description":"Sure. Fine. Just take it. Just have it. You've bought everything else haven't you? ",
+                       "currency":"£",
+                       "prefix":true,
+                       "origional_price":8,
+                       "gallery_price":0.5,
+                       "cost_price":0.87,
+                       "stock_count":300,
+                       "notes":"<ul><li>Too good not to share</li><li>Peice by peice</li><li>Peice by peice</li></ul>",
+                       "crew_notes":"Test crew notes"
+               },
                {
                        "code":"777777",
                        "rating":"&starf;&starf;&starf;&starf;&starf;",
                        "subtext":"The number previously known as 7",
-                       "description":"The Magical Number Seven, Plus or Minus Two. This is the 7 things.",
+                       "description":"The Magical Number Seven, Plus or Minus Two. Nobody needs weeks as much as you!",
                        "currency":"£",
                        "prefix":true,
                        "origional_price":823543,
                        "gallery_price":0.7,
                        "cost_price":0.77,
                        "stock_count":7,
-                       "notes":"<ul><li>Do the 7 ate 9 joke</li><li>Discount by 7s (70%, 7%)</li><li>List plenty of things that begin with 7</li></ul>",
+                       "notes":"<ul><li>Do the 7 ate 9 joke</li><li>Discount by 7s (70%, 7%)</li><li>7 dwarfs</li><li>S-club 7</li><li>David Fincher</li><li>Lucky number</li><li>Deadly sins</li><li>Continets</li><li>Wonders of the word</li><li>Colors in a rainbow</li></ul>",
                        "crew_notes":"Test crew notes"
                },
                {
-                       "code":"424F58",
+                       "code":"",
                        "rating":"&starf;&starf;&starf;&starf;&starf;",
-                       "subtext":"Surprise jack-in-the-box, shock your friends!",
-                       "description":"Surprise-Box&#8482 Limited edition, only 100 EVER made! Beautiful hand-painted sides.",
+                       "subtext":"Corkbaby",
+                       "description":"Get your own corkbaby! A classic household name, connect with the masses.",
                        "currency":"£",
                        "prefix":true,
-                       "origional_price":45,
-                       "gallery_price":1,
-                       "cost_price":0.8,
-                       "stock_count":99,
-                       "notes":"<ul><li>JACK IN THE BOX IS FULL OF BLOOD</li><li>Dont tell the audience its full of blood</li><li>Dont turn the crank unless instructed</li></ul>",
+                       "origional_price":8,
+                       "gallery_price":0.5,
+                       "cost_price":0.87,
+                       "stock_count":300,
+                       "notes":"<ul><li></li></ul>",
                        "crew_notes":"Test crew notes"
                },
                {
-                       "code":"422657",
+                       "code":"",
                        "rating":"&starf;&starf;&starf;&starf;&starf;",
-                       "subtext":"Black and White Blood Chocolate Sauce",
-                       "description":"The perfect topping for Noir detectives in ice-cream bars! Sweet and thick chocolate, made from all natural ingredients.",
+                       "subtext":"Blow Up! Balloons",
+                       "description":"Gasp in one short breath. You know what to do, you were trained for this scenario. Breathe anyway. Ice crisps across your alveoli, entropy pulls liquid from your pores. Pop!",
                        "currency":"£",
                        "prefix":true,
                        "origional_price":8,
                        "gallery_price":0.5,
                        "cost_price":0.87,
                        "stock_count":300,
-                       "notes":"<ul><li>Novelty chocolate sauce that looks like blood in black and white</li><li>Describe how refreshing a nice bowl of ice cream would be</li><li>Treat yourself</li></ul>",
+                       "notes":"<ul><li></li></ul>",
+                       "crew_notes":"Test crew notes"
+               },
+               {
+                       "code":"414E43",
+                       "rating":"&starf;&starf;&starf;&starf;&starf;",
+                       "subtext":"Simulacrum - Agony canned",
+                       "description":"Feel hatred in your heart? Become inhuman, let Id control your judgement! Fundimentality is only your will.",
+                       "currency":"£",
+                       "prefix":true,
+                       "origional_price":8,
+                       "gallery_price":0.5,
+                       "cost_price":0.87,
+                       "stock_count":300,
+                       "notes":"<ul><li></li></ul>",
                        "crew_notes":"Test crew notes"
+               },
+               {
+                       "code":"KLM31N",
+                       "rating":"&starf;&starf;&starf;&starf;&starf;",
+                       "subtext":"Embraer E190",
+                       "description":"Packed to the brim with passengers (114) and crew (6)!",
+                       "currency":"€",
+                       "prefix":true,
+                       "origional_price":10000000,
+                       "gallery_price":1,
+                       "cost_price":1,
+                       "stock_count":127,
+                       "notes":"<ul><li>Pilot</li><li>Co-pilot</li><li>Passengers (114)</li><li>Wings (2)</li><li>Crew (4)</li><li>Tail fins (3)</li><li>Engines (2)</li></ul>",
+                       "crew_notes":"Begin to sell at 2 minutes, plane crashes at 5:30"
+               },
+               {
+                       "code":"424152",
+                       "rating":"&starf;&starf;&starf;&starf;&starf;",
+                       "subtext":"The End",
+                       "description":"I'll see you in the stars!",
+                       "currency":"",
+                       "prefix":false,
+                       "origional_price":0,
+                       "gallery_price":0,
+                       "cost_price":0,
+                       "stock_count":1,
+                       "notes":"<ul><li>STAY STILL</li><li>STAY QUIET</li></ul>",
+                       "crew_notes":"See production document for more information"
                }
        ]
 }

diff --git a/templates/sounds.html b/templates/sounds.html
index d79d627bd9946342c8d848004e4053324e3d776e..905d732deb5195c0b548ff6f514725054391b113 100644 (file)
--- a/templates/sounds.html
+++ b/templates/sounds.html
@@ -21,18 +21,6 @@
                                <td><audio id="timer3" src=/static/sounds/timer3.wav controls></audio></td>
                                <td>Timer 3</td>
                        </tr>
-                       <tr>
-                               <td><audio id="timer4" src=/static/sounds/timer4.wav controls></audio></td>
-                               <td>Timer 4</td>
-                       </tr>
-                       <tr>
-                               <td><audio id="timer5" src=/static/sounds/timer5.wav controls></audio></td>
-                               <td>Timer 5</td>
-                       </tr>
-                       <tr>
-                               <td><audio id="timer6" src=/static/sounds/timer6.wav controls></audio></td>
-                               <td>Timer 6</td>
-                       </tr>
                </table>
                <h2>Doomsday</h2>
                <audio id="clock" src=/static/sounds/clock.wav controls></audio>
@@ -94,20 +82,19 @@ const timers = [
        document.getElementById("timer1"),
        document.getElementById("timer2"),
        document.getElementById("timer3"),
-       document.getElementById("timer4"),
-       document.getElementById("timer5"),
-       document.getElementById("timer6"),
        document.getElementById("clock")
        ];
 const clock = document.getElementById("clock");
 const shout = document.getElementById("shout");
 
-for (let t = 0; t < 6; t++) {
+for (let t = 0; t < 3; t++) {
        let timer = timers[t];
        let track = context.createMediaElementSource(timer);
        track.connect(amp);
 }
 
+let shoutTrack = context.createMediaElementSource(shout);
+shoutTrack.connect(amp);
 
 reverb.then(reverb => {
        track = context.createMediaElementSource(clock);
@@ -149,7 +136,7 @@ function getTimes() {
                        }
 
                        timersPlaying = 0;
-                       for (let t = 0; t < 6; t++) {
+                       for (let t = 0; t < 3; t++) {
                                // if the timer is playing
                                let playing = false;
                                if (timers[t].currentTime > 0 && !timers[t].paused && !timers[t].ended) {
@@ -172,7 +159,7 @@ function getTimes() {
                                                }
 
                                                console.log(`Starting timer ${t}`);
-                                               timers[t].currentTime = timers[t].duration - time;
+                                               timers[t].currentTime = timers[t].duration - 4 - time;
                                                timers[t].volume = 1;
                                                timers[t].play();