Skip to content

Commit

Permalink
catchup commit, trivial changes
Browse files Browse the repository at this point in the history
  • Loading branch information
Zertuk committed Jun 30, 2014
1 parent 2ed23f7 commit adbafd0
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 19 deletions.
3 changes: 3 additions & 0 deletions ascii.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
------------SOME MAY INCLUDE THEIR OLD HTML TAGS------------------
------------------------------------------------------------------


-----------------------------QUESTS-------------------------------

<pre id = "cavern_quest">
Expand Down Expand Up @@ -114,6 +115,8 @@ __ / \
</pre>


------------------------------LOCATIONS------------------------------

<pre>
____ ____
. | /====\ || || /====\
Expand Down
6 changes: 3 additions & 3 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@



<p id = "ectoplasm">You have 0 ectoplasm</p>
<p id = "ectoplasm">You have 0 gold</p>
<p id = "blood">?</p>
<p id = "hp">100/100</p>

Expand Down Expand Up @@ -103,15 +103,15 @@
</div><!--store_special-->

<div id = 'pool_special'>
<button value = "PoolInside" class = "location_button">Yes</button>
<button id = "pool_use" value = "PoolInside" class = "location_button">Yes</button>
<button class = 'location_button' value = "Map">No</button>
</div>

<div id = 'factory_special'>
<button value = "place_one" class = "factory_button">Place Gear</button>
<button value = "place_all" class = "factory_button">Place All</button>
<button value = "use_battery" class = "factory_button">Use Battery</button>
<button value = "make_flesh" class = "factory_button">flesh</button>
<button value = "make_flesh" class = "factory_button">Meld gunk and money</button>
<p id = "seeds_planted">Gears Placed: 0</p>
<p id = "ecto_gen"></p>
<p id = "blood_gen"></p>
Expand Down
37 changes: 21 additions & 16 deletions locationObject.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,22 +41,22 @@ $('.location_button, pre').click(function() {
error.innerHTML = '';
});
}
var animateRecurse;
function animateAscii(location) {
if (location != undefined){
animateRecurse = location;
$('#location_ascii2').html(location.ascii2);
}
if (animateRecurse.animate = true) {
$('#location_ascii').toggle();
$('#location_ascii2').toggle();
// var animateRecurse;
// function animateAscii(location) {
// if (location != undefined){
// animateRecurse = location;
// $('#location_ascii2').html(location.ascii2);
// }
// if (animateRecurse.animate = true) {
// $('#location_ascii').toggle();
// $('#location_ascii2').toggle();

setTimeout(animateAscii, animateRecurse.animateInterval);
}
else {
return;
}
}
// setTimeout(animateAscii, animateRecurse.animateInterval);
// }
// else {
// return;
// }
// }

var Store = new locationInfo();
Store.animate = true;
Expand Down Expand Up @@ -1104,6 +1104,10 @@ _____ /____ \\ /_____________________\\ / ____\\ ____\n\
/ _ - _| \\__ - - - - __/ |_ - _ \\\n\
/ \n\ ';

var Credits = new locationInfo();
Credits.special = "#credits_special";
Credits.ascii = '';


var locationObject = {
Church: Church,
Expand Down Expand Up @@ -1137,5 +1141,6 @@ var locationObject = {
Dock: Dock,
Rocket: Rocket,
SpaceStation: SpaceStation,
Lich: Lich
Lich: Lich,
Credits: Credits
}

0 comments on commit adbafd0

Please sign in to comment.