scripts/deploy.sh @@ -1 +1,4 @@ -.DS_Store \ No newline at end of file +*.DS_Store +deploy +*.pyc +scripts/BeautifulSoup.py .gitignore @@ -422,7 +422,7 @@ var error = function(msg) { var start_tower_defense = function() { setup = function() { $('#pause_button').html("Pause"); - set_canvas($('#tower_defense canvas')[0]); + set_canvas("tower_defense"); reset_game(); size(SET.width, SET.height); frameRate(SET.framerate); game/ptd.js @@ -1,6 +1,7 @@ var GLOBAL_PROCESSING; -function set_canvas(element) { - GLOBAL_PROCESSING = Processing(element); +function set_canvas(id) { + var canvas = document.getElementById(id); + GLOBAL_PROCESSING = Processing(canvas); } function size(height, width) { jsfprocessing.js @@ -1,5 +1,7 @@ -<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN"> -<html> <head> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/2001/REC-xhtml11-20010531/DTD/xhtml11-flat.dtd"> + +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> +<head> <meta http-equiv="Content-type" content="text/html; charset=utf-8" /> <title>Processed Tower Defense</title> <link href="style.css" media="screen" rel="Stylesheet" type="text/css" /> @@ -13,38 +15,38 @@ <div id="game"> <div id="top_controls"> - <span> Lives: <span id="lives">20</span></span> - <span> Score: <span id="score">0</span></span> - <span> Gold: <span id="gold">0</span></span> - <span> Wave: <span id="wave">1</span></span> - <span> Creep Variety: <span id="creep_variety"></span></span> - <span> Next Wave in <div style='display:inline;' id="till_next_wave"></div> seconds</span> + <span class='item'> Lives: <span id="lives">20</span></span> + <span class='item'> Score: <span id="score">0</span></span> + <span class='item'> Gold: <span id="gold">0</span></span> + <span class='item'> Wave: <span id="wave">1</span></span> + <span class='item'> Creep Variety: <span id="creep_variety"></span></span> + <span class='item'> Next Wave in <span id="till_next_wave"></span> seconds</span> </div> <div id="middle"> -<canvas id="tower_defense" width="600" height="400"></canvas> +<canvas id='tower_defense' width="600" height="400"></canvas> <div id="side"> <div id="controls"> <table> <tr> - <td> <button onclick="build_laser_tower();" accesskey="L">Build <u>L</u>aser Tower - 50 Gold</button> </td> + <td> <button onclick="build_laser_tower();" accesskey="L">Build <span class='hotkey'>L</span>aser Tower - 50 Gold</button> </td> </tr> <tr> - <td> <button onclick="build_gattling_tower();"> Build <u>G</u>attling Tower - 50 Gold</button></td> + <td> <button onclick="build_gattling_tower();"> Build <span class='hotkey'>G</span>attling Tower - 50 Gold</button></td> </tr> <tr> - <td> <button onclick="build_missile_tower();" accesskey="M">Build <u>M</u>issile Tower - 100 Gold</button> </td> + <td> <button onclick="build_missile_tower();" accesskey="M">Build <span class='hotkey'>M</span>issile Tower - 100 Gold</button> </td> </tr> <tr> - <td> <button onclick="build_cannon_tower();" accesskey="M">Build <u>C</u>annon Tower - 100 Gold</button> </td> + <td> <button onclick="build_cannon_tower();" accesskey="M">Build <span class='hotkey'>C</span>annon Tower - 100 Gold</button> </td> </tr> <tr> - <td> <button onclick="aim_missile();" accesskey="S">Launch <u>S</u>mall Missile - 50 Gold</button></td> + <td> <button onclick="aim_missile();" accesskey="S">Launch <span class='hotkey'>S</span>mall Missile - 50 Gold</button></td> </tr> <tr> - <td> <button onclick="nuke_creeps();" accesskey="N"> Launch <u>N</u>uke - <span id="nukes_left"> 3 left </span></button></td> + <td> <button onclick="nuke_creeps();" accesskey="N"> Launch <span class='hotkey'>N</span>uke - <span id="nukes_left"> 3 left </span></button></td> </tr> <tr><td><div class='error'></div></td></tr> <tr><td><div class='message'></div></td></tr> @@ -55,11 +57,11 @@ <table> <tr><td></td><td> <em>Tower Details</em> </td></tr> <tr><td> Type: </td><td id="tower_type"></td></tr> - <tr><td> Range: </td><td id="tower_range"></tr> - <tr><td> Damage: </td><td id="tower_damage"></tr> - <tr><td> Firing Rate: </td><td id="tower_rate"></tr> + <tr><td> Range: </td><td id="tower_range"></td></tr> + <tr><td> Damage: </td><td id="tower_damage"></td></tr> + <tr><td> Firing Rate: </td><td id="tower_rate"></td></tr> <tr><td><button id="tower_sell_button"></button></td></tr> - <tr><td><button id="tower_upgrade_button"><u>U</u>pgrade!</button></td></tr> + <tr><td><button id="tower_upgrade_button"><span class='hotkey'>U</span>pgrade!</button></td></tr> </table> </div> <div id="creep"> @@ -76,7 +78,7 @@ <div id="bottom_controls"> <button id='pause_button' onclick="pause();">Pause</button> <button onclick="reset_game();">Reset Game</button> - <button onclick="spawn_wave();">Spawn Next <u>W</u>ave</button> + <button onclick="spawn_wave();">Spawn Next <span class='hotkey'>W</span>ave</button> <button id='mute_button' onclick="mute();">Mute</button> </div> </div> @@ -171,9 +173,9 @@ </script> -<hr> +<hr/> <p><a rel="license" href="http://www.opensource.org/licenses/mit-license.php">MIT License</a>, by <a href="http://lethain.com">Will Larson</a> and <a href="http://blog.rictic.com/">Peter Burns</a></p> <p>Sound effects are released under a <a href='http://creativecommons.org/licenses/sampling+/1.0/'>Creative Commons Sampling Plus 1.0 License</a> - For authorship information, see <a href='assets/LICENSE'>here</a></p> <div id="log"></div> -<div id="sfx_dump"/></div> +<div id="sfx_dump"></div> </body> </html> ptd.html @@ -49,7 +49,7 @@ def main(): merged_src["type"] = "text/javascript" js_imports_div.replaceWith(merged_src) merged_html = open(MERGED_HTML_NAME, 'w') - merged_html.write(soup.prettify()) + merged_html.write(str(soup)) merged_html.close() print "Created HTML file: %s" % MERGED_HTML_NAME scripts/build.py @@ -49,7 +49,7 @@ div#game { float: left; } -#top_controls span { +#top_controls .item { padding-right: 10px; } style.css 70ad107e13f28038084e71ac33417bcc9da46785 Peter Burns peter@metaweb.com http://github.com/rictic/processing-tower-defense/commit/fd8afdd98cb4be1bf2198b9f982b7503517197a5 fd8afdd98cb4be1bf2198b9f982b7503517197a5

2008-06-05T01:26:46-07:00

Fixed underline problem in deploy, cleaned html [#20 state:resolved] BeautifulSoup isn't beautifying our html any more, but I've gone through and validated our html as it stands (besides the <canvas> element), and I'll take up that responsibility. I also wrote a simple deploy script. If it gets much more complicated, we should look at rake. Sure it adds another dependency, but it's *so* nice for doing this sort of thing. 120a23422d04406271493823e7ddc2d5aa010097 Peter Burns peter@metaweb.com