Skip to content

Commit

Permalink
- added link to doublespeak
Browse files Browse the repository at this point in the history
- added cross-promotion event for Penrose
- removed dead Dropbox code
  • Loading branch information
Continuities committed Jan 28, 2021
1 parent f8b3c03 commit bddb271
Show file tree
Hide file tree
Showing 5 changed files with 65 additions and 6 deletions.
11 changes: 11 additions & 0 deletions css/main.css
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,17 @@ div#header {
height: 20px;
}

.logo {
position: fixed;
left: 10px;
bottom: 0;
z-index: 10;
}

.logo-icon {
height: 40px;
}

.menu {
position: fixed;
right: 10px;
Expand Down
12 changes: 8 additions & 4 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
<link rel="shortcut icon" href="favicon.ico" />
<link rel="image_src" href="img/adr.png" />
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.10.1/jquery.min.js"></script>
<script src="https://www.dropbox.com/static/api/dropbox-datastores-1.1-latest.js" type="text/javascript"></script>
<script>
if(!window.jQuery) {
document.write('<script src="lib/jquery.min.js"><\/script>')
Expand Down Expand Up @@ -55,7 +54,6 @@
<script src="script/header.js"></script>
<script src="script/notifications.js"></script>
<script src="script/events.js"></script>
<script src="script/dropbox.js"></script>
<script src="script/room.js"></script>
<script src="script/outside.js"></script>
<script src="script/world.js"></script>
Expand All @@ -69,7 +67,8 @@
<script src="script/events/room.js"></script>
<script src="script/events/outside.js"></script>
<script src="script/events/encounters.js"></script>
<script src="script/events/setpieces.js"></script>
<script src="script/events/setpieces.js"></script>
<script src="script/events/marketing.js"></script>

<script type='text/javascript'>
var oldIE = false;
Expand Down Expand Up @@ -109,6 +108,11 @@
</div>
</div>
</div>
</div>
</div>
<a class="logo" href="https://www.doublespeakgames.com" alt="doublespeak games" target="_blank">
<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0 0 41.75 32.84375" class="logo-icon">
<path d="m 18.024533,28.5722 c 2.532365,-2.243 5.064679,-4.4861 7.596993,-6.7292 4.907813,0 9.815625,0 14.723438,0 0,-6.8136 0,-13.6272 0,-20.4408 -12.976656,0 -25.953312,0 -38.9299676,0 0,6.8136 0,13.6272 0,20.4408 3.2917905,0 6.5835811,0 9.8753716,0 -0.643311,2.2431 -1.286622,4.4861 -1.9299604,6.7292 2.5323644,-2.243 5.0646784,-4.4861 7.5969924,-6.7292 0.999066,0 1.998131,0 2.997197,0 -0.643345,2.2431 -1.286691,4.4861 -1.930064,6.7292 z" style="stroke-width:1.0;stroke:black;fill:none;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none"></path>
</svg>
</a>
</body>
</html>
2 changes: 1 addition & 1 deletion script/engine.js
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@
Engine.saveLanguage();
Engine.travelTo(Room);

setTimeout(notifyAboutSound, 3000);
setTimeout(notifyAboutSound, 3000);

},
resumeAudioContext: function () {
Expand Down
11 changes: 10 additions & 1 deletion script/events.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ var Events = {
Events.EventPool = [].concat(
Events.Global,
Events.Room,
Events.Outside
Events.Outside,
Events.Marketing
);

Events.eventStack = [];
Expand Down Expand Up @@ -995,6 +996,14 @@ var Events = {
Notifications.notify(null, info.notification);
}

info.onClick && info.onClick();

// Link
if (info.link) {
Events.endEvent();
window.open(info.link);
}

// Next Scene
if(info.nextScene) {
if(info.nextScene == 'end') {
Expand Down
35 changes: 35 additions & 0 deletions script/events/marketing.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
/**
Module for triggering marketing messages
@author mtownsend
@since Jan 2021
*/

Events.Marketing = [{
/* Play Penrose! */
title: _('Penrose'),
isAvailable: () => !$SM.get('marketing.penrose'),
scenes: {
'start': {
text: [
_('a strange thrumming, pounding and crashing. visions of people and places, of a huge machine and twisting curves.'),
_('inviting. it would be so easy to give in, completely.')
],
notification: _('a strange thrumming, pounding and crashing. and then gone.'),
blink: true,
buttons: {
'give in': {
text: _('give in'),
onClick: () => {
$SM.set('marketing.penrose', true);
},
link: 'https://penrose.doublespeakgames.com'
},
'ignore': {
text: _('ignore it'),
nextScene: 'end'
}
}
}
},
audio: AudioLibrary.EVENT_NOISES_INSIDE
}];

0 comments on commit bddb271

Please sign in to comment.