diff --git a/index.html b/index.html index 304ff88..452ce89 100644 --- a/index.html +++ b/index.html @@ -264,7 +264,7 @@ """ { - {item "0"} == 2 ? - {end}{wvy}Thank you for finding me my favorite cake!{wvy} {printItem "0"} + {end}{wvy}Thank you for finding me my favorite cake!{wvy} {printItem "0"}{pg}{wavy}Happy Mother's Day!{wavy} - else ? Go to the depths of the ocean{pg}and find {wvy}chiffon cake{wvy} {printItem "0"} for me! } @@ -1666,7 +1666,7 @@ } function createCharData() { - return { + return { width: width, height: height, offset: { @@ -3012,7 +3012,7 @@ this.Eval = function(environment,onReturn) { // bitsyLog("EVAL " + this.operator); var self = this; // hack to deal with scope - environment.EvalOperator( this.operator, this.left, this.right, + environment.EvalOperator( this.operator, this.left, this.right, function(val){ // bitsyLog("EVAL EXP " + self.operator + " " + val); onReturn(val); @@ -3148,7 +3148,7 @@ var index = 0; this.Eval = function(environment, onReturn) { optionsShuffled[index].Eval(environment, onReturn); - + index++; if (index >= this.children.length) { shuffle(this.children); @@ -3499,7 +3499,7 @@ addCodeNodeToList(); } else if (state.MatchAhead(Sym.Linebreak)) { // process new line - // add any buffered text to a print node, + // add any buffered text to a print node, // and add a linebreak if we are between two dialog lines tryAddTextNodeToList(); tryAddLinebreakNodeToList(); @@ -4045,8 +4045,8 @@ peakToFirstConditionSymbol = peakToFirstConditionSymbol.slice(peakToFirstListSymbol.length); var hasNoLinebreakBetweenListAndConditionEnd = peakToFirstConditionSymbol.indexOf(Sym.Linebreak) == -1; - return foundListSymbol && - areAllCharsBeforeListWhitespace && + return foundListSymbol && + areAllCharsBeforeListWhitespace && hasNoLinebreakBetweenListAndConditionEnd; } @@ -4371,7 +4371,7 @@ isDialogReadyToContinue = true; didPageFinishThisFrame = true; } - + this.CurChar().OnPrint(); // make sure we hit the callback before we run out of text } }; @@ -4738,7 +4738,7 @@ buffer.splice(buffer.length-1, 1); } - //finish up + //finish up lastPage = buffer[buffer.length-1]; lastRow = lastPage[lastPage.length-1]; if (lastRow.length > 0) { @@ -4785,7 +4785,7 @@ curRowArr.push(pagebreakChar); - isActive = true; + isActive = true; } /* new text effects */ @@ -4825,48 +4825,48 @@ // map glyphs to their character forms var glyphForms = { /* Isolated, Final, Initial, Middle Forms */ - 0x0621: [0xFE80,0xFE80,0xFE80,0xFE80], /* HAMZA */ - 0x0622: [0xFE81,0xFE82,0xFE81,0xFE82], /* ALEF WITH MADDA ABOVE */ - 0x0623: [0xFE83,0xFE84,0xFE83,0xFE84], /* ALEF WITH HAMZA ABOVE */ - 0x0624: [0xFE85,0xFE86,0xFE85,0xFE86], /* WAW WITH HAMZA ABOVE */ - 0x0625: [0xFE87,0xFE88,0xFE87,0xFE88], /* ALEF WITH HAMZA BELOW */ - 0x0626: [0xFE89,0xFE8A,0xFE8B,0xFE8C], /* YEH WITH HAMZA ABOVE */ - 0x0627: [0xFE8D,0xFE8E,0xFE8D,0xFE8E], /* ALEF */ - 0x0628: [0xFE8F,0xFE90,0xFE91,0xFE92], /* BEH */ - 0x0629: [0xFE93,0xFE94,0xFE93,0xFE94], /* TEH MARBUTA */ - 0x062A: [0xFE95,0xFE96,0xFE97,0xFE98], /* TEH */ - 0x062B: [0xFE99,0xFE9A,0xFE9B,0xFE9C], /* THEH */ - 0x062C: [0xFE9D,0xFE9E,0xFE9F,0xFEA0], /* JEEM */ - 0x062D: [0xFEA1,0xFEA2,0xFEA3,0xFEA4], /* HAH */ - 0x062E: [0xFEA5,0xFEA6,0xFEA7,0xFEA8], /* KHAH */ - 0x062F: [0xFEA9,0xFEAA,0xFEA9,0xFEAA], /* DAL */ - 0x0630: [0xFEAB,0xFEAC,0xFEAB,0xFEAC], /* THAL */ - 0x0631: [0xFEAD,0xFEAE,0xFEAD,0xFEAE], /* RAA */ - 0x0632: [0xFEAF,0xFEB0,0xFEAF,0xFEB0], /* ZAIN */ - 0x0633: [0xFEB1,0xFEB2,0xFEB3,0xFEB4], /* SEEN */ - 0x0634: [0xFEB5,0xFEB6,0xFEB7,0xFEB8], /* SHEEN */ - 0x0635: [0xFEB9,0xFEBA,0xFEBB,0xFEBC], /* SAD */ - 0x0636: [0xFEBD,0xFEBE,0xFEBF,0xFEC0], /* DAD */ - 0x0637: [0xFEC1,0xFEC2,0xFEC3,0xFEC4], /* TAH */ - 0x0638: [0xFEC5,0xFEC6,0xFEC7,0xFEC8], /* ZAH */ - 0x0639: [0xFEC9,0xFECA,0xFECB,0xFECC], /* AIN */ - 0x063A: [0xFECD,0xFECE,0xFECF,0xFED0], /* GHAIN */ + 0x0621: [0xFE80,0xFE80,0xFE80,0xFE80], /* HAMZA */ + 0x0622: [0xFE81,0xFE82,0xFE81,0xFE82], /* ALEF WITH MADDA ABOVE */ + 0x0623: [0xFE83,0xFE84,0xFE83,0xFE84], /* ALEF WITH HAMZA ABOVE */ + 0x0624: [0xFE85,0xFE86,0xFE85,0xFE86], /* WAW WITH HAMZA ABOVE */ + 0x0625: [0xFE87,0xFE88,0xFE87,0xFE88], /* ALEF WITH HAMZA BELOW */ + 0x0626: [0xFE89,0xFE8A,0xFE8B,0xFE8C], /* YEH WITH HAMZA ABOVE */ + 0x0627: [0xFE8D,0xFE8E,0xFE8D,0xFE8E], /* ALEF */ + 0x0628: [0xFE8F,0xFE90,0xFE91,0xFE92], /* BEH */ + 0x0629: [0xFE93,0xFE94,0xFE93,0xFE94], /* TEH MARBUTA */ + 0x062A: [0xFE95,0xFE96,0xFE97,0xFE98], /* TEH */ + 0x062B: [0xFE99,0xFE9A,0xFE9B,0xFE9C], /* THEH */ + 0x062C: [0xFE9D,0xFE9E,0xFE9F,0xFEA0], /* JEEM */ + 0x062D: [0xFEA1,0xFEA2,0xFEA3,0xFEA4], /* HAH */ + 0x062E: [0xFEA5,0xFEA6,0xFEA7,0xFEA8], /* KHAH */ + 0x062F: [0xFEA9,0xFEAA,0xFEA9,0xFEAA], /* DAL */ + 0x0630: [0xFEAB,0xFEAC,0xFEAB,0xFEAC], /* THAL */ + 0x0631: [0xFEAD,0xFEAE,0xFEAD,0xFEAE], /* RAA */ + 0x0632: [0xFEAF,0xFEB0,0xFEAF,0xFEB0], /* ZAIN */ + 0x0633: [0xFEB1,0xFEB2,0xFEB3,0xFEB4], /* SEEN */ + 0x0634: [0xFEB5,0xFEB6,0xFEB7,0xFEB8], /* SHEEN */ + 0x0635: [0xFEB9,0xFEBA,0xFEBB,0xFEBC], /* SAD */ + 0x0636: [0xFEBD,0xFEBE,0xFEBF,0xFEC0], /* DAD */ + 0x0637: [0xFEC1,0xFEC2,0xFEC3,0xFEC4], /* TAH */ + 0x0638: [0xFEC5,0xFEC6,0xFEC7,0xFEC8], /* ZAH */ + 0x0639: [0xFEC9,0xFECA,0xFECB,0xFECC], /* AIN */ + 0x063A: [0xFECD,0xFECE,0xFECF,0xFED0], /* GHAIN */ 0x063B: [0x0000,0x0000,0x0000,0x0000], /* space */ 0x063C: [0x0000,0x0000,0x0000,0x0000], /* space */ 0x063D: [0x0000,0x0000,0x0000,0x0000], /* space */ 0x063E: [0x0000,0x0000,0x0000,0x0000], /* space */ 0x063F: [0x0000,0x0000,0x0000,0x0000], /* space */ - 0x0640: [0x0640,0x0640,0x0640,0x0640], /* TATWEEL */ - 0x0641: [0xFED1,0xFED2,0xFED3,0xFED4], /* FAA */ - 0x0642: [0xFED5,0xFED6,0xFED7,0xFED8], /* QAF */ - 0x0643: [0xFED9,0xFEDA,0xFEDB,0xFEDC], /* KAF */ - 0x0644: [0xFEDD,0xFEDE,0xFEDF,0xFEE0], /* LAM */ - 0x0645: [0xFEE1,0xFEE2,0xFEE3,0xFEE4], /* MEEM */ - 0x0646: [0xFEE5,0xFEE6,0xFEE7,0xFEE8], /* NOON */ - 0x0647: [0xFEE9,0xFEEA,0xFEEB,0xFEEC], /* HEH */ - 0x0648: [0xFEED,0xFEEE,0xFEED,0xFEEE], /* WAW */ - 0x0649: [0xFEEF,0xFEF0,0xFBE8,0xFBE9], /* ALEF MAKSURA */ - 0x064A: [0xFEF1,0xFEF2,0xFEF3,0xFEF4], /* YEH */ + 0x0640: [0x0640,0x0640,0x0640,0x0640], /* TATWEEL */ + 0x0641: [0xFED1,0xFED2,0xFED3,0xFED4], /* FAA */ + 0x0642: [0xFED5,0xFED6,0xFED7,0xFED8], /* QAF */ + 0x0643: [0xFED9,0xFEDA,0xFEDB,0xFEDC], /* KAF */ + 0x0644: [0xFEDD,0xFEDE,0xFEDF,0xFEE0], /* LAM */ + 0x0645: [0xFEE1,0xFEE2,0xFEE3,0xFEE4], /* MEEM */ + 0x0646: [0xFEE5,0xFEE6,0xFEE7,0xFEE8], /* NOON */ + 0x0647: [0xFEE9,0xFEEA,0xFEEB,0xFEEC], /* HEH */ + 0x0648: [0xFEED,0xFEEE,0xFEED,0xFEEE], /* WAW */ + 0x0649: [0xFEEF,0xFEF0,0xFBE8,0xFBE9], /* ALEF MAKSURA */ + 0x064A: [0xFEF1,0xFEF2,0xFEF3,0xFEF4], /* YEH */ 0x064B: [0xFEF5,0xFEF6,0xFEF5,0xFEF6], /* LAM ALEF MADD*/ 0x064C: [0xFEF7,0xFEF8,0xFEF7,0xFEF8], /* LAM ALEF HAMZA ABOVE*/ 0x064D: [0xFEF9,0xFEFa,0xFEF9,0xFEFa], /* LAM ALEF HAMZA BELOW*/ @@ -5335,7 +5335,7 @@ startWithTitle = true; } - if (startWithTitle) { // used by editor + if (startWithTitle) { // used by editor startNarrating(getTitle()); } } @@ -5595,7 +5595,7 @@ else if ( curPlayerDirection == Direction.Down && !(spr = getSpriteDown()) && !isWallDown()) { player().y += 1; } - + var ext = getExit( player().room, player().x, player().y ); var end = getEnding( player().room, player().x, player().y ); var itmIndex = getItemIndex( player().room, player().x, player().y ); @@ -6083,7 +6083,7 @@ // old non-comma separated format for (i in room[id].tilemap) { for (j in room[id].tilemap[i]) { - worldStr += room[id].tilemap[i][j]; + worldStr += room[id].tilemap[i][j]; } worldStr += "\n"; } @@ -6357,7 +6357,7 @@ }; } else if ( flags.ROOM_FORMAT == 0 ) { // TODO: right now this shortcut only works w/ the old comma separate format - /* PLACE MULTIPLE SPRITES*/ + /* PLACE MULTIPLE SPRITES*/ //Does find and replace in the tilemap (may be hacky, but its convenient) var sprList = sprId.split(","); for (row in room[id].tilemap) { @@ -9399,4 +9399,4 @@ - \ No newline at end of file +