Permalink
Browse files

add two experimental levels

  • Loading branch information...
1 parent ba0548e commit 258e9a45b4984f2a5e32191bed719147288af938 @kripken committed Sep 21, 2012
View
BIN cube2/assets/screenshots/03.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN cube2/assets/screenshots/03_mini.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN cube2/assets/screenshots/07_mini.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
32 cube2/css/style.css
@@ -164,6 +164,14 @@ a:hover {
background-image: url('../assets/screenshots/14_mini.jpg');
}
+#menu .menu-item:nth-child(4) {
+ background-image: url('../assets/screenshots/03_mini.jpg');
+}
+
+#menu .menu-item:nth-child(5) {
+ background-image: url('../assets/screenshots/07_mini.jpg');
+}
+
#menu .title {
font-size: 1.3em;
position: relative;
@@ -471,6 +479,30 @@ canvas.paused {
background-size: 110% 110%;
}
+.preview-content.four {
+ background: url('../assets/screenshots/03.jpg');
+ background: -moz-linear-gradient(top, rgba(0,0,0,1) 0%, rgba(0,0,0,0.8) 10%, rgba(0,0,0,0.2) 30%, rgba(0,0,0,0) 60%), url('../assets/screenshots/03.jpg');
+ background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(0,0,0,1)), color-stop(10%,rgba(0,0,0,0.8)), color-stop(30%,rgba(0,0,0,0.2)), color-stop(60%,rgba(0,0,0,0))), url('../assets/screenshots/03.jpg');
+ background: -webkit-linear-gradient(top, rgba(0,0,0,1) 0%,rgba(0,0,0,0.8) 10%,rgba(0,0,0,0.2) 30%,rgba(0,0,0,0) 60%), url('../assets/screenshots/03.jpg');
+ background: -o-linear-gradient(top, rgba(0,0,0,1) 0%,rgba(0,0,0,0.8) 10%,rgba(0,0,0,0.2) 30%,rgba(0,0,0,0) 60%), url('../assets/screenshots/03.jpg');
+ background: -ms-linear-gradient(top, rgba(0,0,0,1) 0%,rgba(0,0,0,0.8) 10%,rgba(0,0,0,0.2) 30%,rgba(0,0,0,0) 60%), url('../assets/screenshots/03.jpg');
+ background: linear-gradient(to bottom, rgba(0,0,0,1) 0%,rgba(0,0,0,0.8) 10%,rgba(0,0,0,0.2) 30%,rgba(0,0,0,0) 60%), url('../assets/screenshots/03.jpg');
+ background-position: 5% 5%;
+ background-size: 110% 110%;
+}
+
+.preview-content.five {
+ background: url('../assets/screenshots/07.jpg');
+ background: -moz-linear-gradient(top, rgba(0,0,0,1) 0%, rgba(0,0,0,0.8) 10%, rgba(0,0,0,0.2) 30%, rgba(0,0,0,0) 60%), url('../assets/screenshots/07.jpg');
+ background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(0,0,0,1)), color-stop(10%,rgba(0,0,0,0.8)), color-stop(30%,rgba(0,0,0,0.2)), color-stop(60%,rgba(0,0,0,0))), url('../assets/screenshots/07.jpg');
+ background: -webkit-linear-gradient(top, rgba(0,0,0,1) 0%,rgba(0,0,0,0.8) 10%,rgba(0,0,0,0.2) 30%,rgba(0,0,0,0) 60%), url('../assets/screenshots/07.jpg');
+ background: -o-linear-gradient(top, rgba(0,0,0,1) 0%,rgba(0,0,0,0.8) 10%,rgba(0,0,0,0.2) 30%,rgba(0,0,0,0) 60%), url('../assets/screenshots/07.jpg');
+ background: -ms-linear-gradient(top, rgba(0,0,0,1) 0%,rgba(0,0,0,0.8) 10%,rgba(0,0,0,0.2) 30%,rgba(0,0,0,0) 60%), url('../assets/screenshots/07.jpg');
+ background: linear-gradient(to bottom, rgba(0,0,0,1) 0%,rgba(0,0,0,0.8) 10%,rgba(0,0,0,0.2) 30%,rgba(0,0,0,0) 60%), url('../assets/screenshots/07.jpg');
+ background-position: 5% 5%;
+ background-size: 110% 110%;
+}
+
.preview-content .description {
color: rgb(240, 240, 240);
text-shadow: rgba(0, 0, 0, 1.0) 2px 2px 2px, rgba(0, 0, 0, 1.0) 2px 2px 2px;
View
10 cube2/game.html
@@ -30,6 +30,16 @@
A large underground complex with a huge chamber of lava as well as side rooms with pools of water and intricate columns. Notice the texture effects on the walls and other visual effects like glare on the lava itself. This level is very large and detail levels are set to the max - it is designed to stress your browser. (Tip: Find the three teleporters!)
</div>
</div>
+ <div class="preview-content four">
+ <div class="description">
+ A sci-fi styled space with multiple levels of narrow walkways. Use a combination of careful jumping, falling, and the red pads to move around! (This level is experimental.)
+ </div>
+ </div>
+ <div class="preview-content five">
+ <div class="description">
+ A smaller version of "Lava Chamber" with a few small side rooms. Perfect for fighting bots in! (This level is experimental.)
+ </div>
+ </div>
<div class="level-title">Preparing<span></span></div>
</div>
<div class="progress-container">
View
17 cube2/game/setup_five.js
@@ -0,0 +1,17 @@
+
+Module.setPlayerModels = function() {
+ BananaBread.setPlayerModelInfo("snoutx10k", "snoutx10k", "snoutx10k", "snoutx10k/hudguns", 0, 0, 0, 0, 0, "snoutx10k", "snoutx10k", "snoutx10k", true);
+};
+
+Module.tweakDetail = function() {
+ BananaBread.execute('fog 10000'); // disable fog
+ BananaBread.execute('maxdebris 10');
+ BananaBread.execute('glare 1');
+ BananaBread.execute('glarescale 1.75');
+ BananaBread.execute('blurglare 7');
+};
+
+Module.loadDefaultMap = function() {
+ BananaBread.execute('sleep 10 [ effic zoomout ; sleep 20000 [ addbot 50 ] ]');
+};
+
View
13 cube2/game/setup_four.js
@@ -0,0 +1,13 @@
+
+Module.setPlayerModels = function() {
+ BananaBread.setPlayerModelInfo("snoutx10k", "snoutx10k", "snoutx10k", "snoutx10k/hudguns", 0, 0, 0, 0, 0, "snoutx10k", "snoutx10k", "snoutx10k", true);
+};
+
+Module.tweakDetail = function() {
+ BananaBread.execute('maxdebris 10');
+};
+
+Module.loadDefaultMap = function() {
+ BananaBread.execute('sleep 10 [ effic cyber1 ; sleep 20000 [ addbot 50 ] ]');
+};
+
View
10 cube2/index.html
@@ -48,6 +48,16 @@
<div class="title">Play: Level 3</div>
<div class="sub-title">Lava Chamber</div>
</a>
+ <a class="menu-item" href="game.html?four,four">
+ <div class="overlay"></div>
+ <div class="title">Play: Level 4 (experimental)</div>
+ <div class="sub-title">Future</div>
+ </a>
+ <a class="menu-item" href="game.html?five,five">
+ <div class="overlay"></div>
+ <div class="title">Play: Level 5 (experimental)</div>
+ <div class="sub-title">Lava Rooms</div>
+ </a>
</div>
<div id="video">
<div class="overlay"></div>
View
10 cube2/js/game-setup.js
@@ -474,7 +474,15 @@ if (typeof Recorder != 'undefined') {
var setup = urlParts[0], preload = urlParts[1];
var levelTitleContainer = document.querySelector('.level-title span');
- var levelTitle = setup === 'high' ? 'Lava Chamber' : setup === 'medium' ? 'Two Towers' : 'Arena';
+ var levelTitle;
+ switch(setup) {
+ case 'low': levelTitle = 'Arena'; break;
+ case 'medium': levelTitle = 'Two Towers'; break;
+ case 'high': levelTitle = 'Lava Chamber'; break;
+ case 'four': levelTitle = 'Future'; break;
+ case 'five': levelTitle = 'Lava Rooms'; break;
+ default: throw('unknown setup: ' + setup);
+ };
levelTitleContainer.innerHTML = levelTitle;
var previewContainer = document.querySelector('.preview-content.' + setup );
View
22 cube2/src/web/Makefile
@@ -306,10 +306,12 @@ ZOOM_FILES = packages/base/zoom.ogz \
ZOOMIN_FILES = packages/base/zoomin.ogz \
packages/base/zoomin.cfg \
+ packages/base/zoomin.wpt \
$(ZOOM_TEXTURES)
ZOOMOUT_FILES = packages/base/zoomout.ogz \
packages/base/zoomout.cfg \
+ packages/base/zoomout.wpt \
$(ZOOM_TEXTURES)
MD2_FILES = packages/base/md2.ogz \
@@ -422,12 +424,30 @@ HIGH_FILES = $(BASE_FILES) \
$(SNOUTX10K_MODEL_FILES) \
$(HUDGUNS_FILES)
-CRUNCH_QUALITY = 16
+FOUR_FILES = $(BASE_FILES) \
+ $(CYBER1_FILES) \
+ $(SNOUTX10K_MODEL_FILES) \
+ $(HUDGUNS_FILES)
+
+FIVE_FILES = $(BASE_FILES) \
+ $(ZOOMOUT_FILES) \
+ $(SNOUTX10K_MODEL_FILES) \
+ $(HUDGUNS_FILES)
+
+SIX_FILES = $(BASE_FILES) \
+ $(ZOOMIN_FILES) \
+ $(SNOUTX10K_MODEL_FILES) \
+ $(HUDGUNS_FILES)
+
+CRUNCH_QUALITY = 64
client: client.bc
cd .. ; cd .. ; python $(EMSCRIPTEN)/tools/file_packager.py low.data --crunch=$(CRUNCH_QUALITY) --preload $(LOW_FILES) --pre-run > game/preload_low.js
cd .. ; cd .. ; python $(EMSCRIPTEN)/tools/file_packager.py medium.data --crunch=$(CRUNCH_QUALITY) --preload $(MEDIUM_FILES) --pre-run > game/preload_medium.js
cd .. ; cd .. ; python $(EMSCRIPTEN)/tools/file_packager.py high.data --crunch=$(CRUNCH_QUALITY) --preload $(HIGH_FILES) --pre-run > game/preload_high.js
+ cd .. ; cd .. ; python $(EMSCRIPTEN)/tools/file_packager.py four.data --crunch=$(CRUNCH_QUALITY) --preload $(FOUR_FILES) --pre-run > game/preload_four.js
+ cd .. ; cd .. ; python $(EMSCRIPTEN)/tools/file_packager.py five.data --crunch=$(CRUNCH_QUALITY) --preload $(FIVE_FILES) --pre-run > game/preload_five.js
+ #cd .. ; cd .. ; python $(EMSCRIPTEN)/tools/file_packager.py six.data --crunch=$(CRUNCH_QUALITY) --preload $(SIX_FILES) --pre-run > game/preload_six.js
cd .. ; cd .. ; $(CXX) $(CXXFLAGS) src/web/client.bc src/web/libz.a -o game/bb.debug.js -s TOTAL_MEMORY=31457280 -s DISABLE_EXCEPTION_CATCHING=1 -s EXPORTED_FUNCTIONS="['_main', '__ZN4game18setplayermodelinfoEPKcS1_S1_S1_S1_S1_S1_S1_S1_S1_S1_S1_b', '__Z7executePKc', '__Z10executestrPKc', '_setforcecamera', '_bb_splash', '_bb_playsoundname']" -O2 --closure 0 #-s PROFILE_MAIN_LOOP=1
cd .. ; cd .. ; $(CXX) $(CXXFLAGS) src/web/client.bc src/web/libz.a -o game/bb.js -s TOTAL_MEMORY=31457280 -s DISABLE_EXCEPTION_CATCHING=1 -s EXPORTED_FUNCTIONS="['_main', '__ZN4game18setplayermodelinfoEPKcS1_S1_S1_S1_S1_S1_S1_S1_S1_S1_S1_b', '__Z7executePKc', '__Z10executestrPKc', '_setforcecamera', '_bb_splash', '_bb_playsoundname']" -O2 #-s PROFILE_MAIN_LOOP=1

0 comments on commit 258e9a4

Please sign in to comment.