Bug fixes

developper.txt

@@ -0,0 +1,3 @@
+;1;
+    
+end

irc.txt

@@ -11,27 +11,27 @@
 ////           ////
 
 ;1;
-	text: You are on your computer. You have two IRC clients.
-		option: Start IceChat
+    text: You are on your computer. You have two IRC clients.
+        option: Start IceChat
                     info: Everyone makes fun of you and then your computer explodes.
                     info: -1 Computer
                     endgame: You learn IRC is a horrible place with many haters and never join again. You live a lonely life with no friends.
                 endoption
-		option: Start Hexchat
+        option: Start Hexchat
         endoption
 end
 
 ;1.2;
 
-	text: You join #powder.
-		option: Also join #powder-bots
+    text: You join #powder.
+        option: Also join #powder-bots
         endoption
-		option: Also join ##werewolf
+        option: Also join ##werewolf
         endoption
-		option: Join the conversation
-			rand: ;1.2.3;|;1.2.5;
+        option: Join the conversation
+            rand: ;1.2.3;|;1.2.5;
         endoption
-		option: Idle
+        option: Idle
         endoption
 end
 
@@ -39,50 +39,48 @@ end
 
 ;1.2.1;
 
-	text: Crackbot is in here.
-		option: ./use cow
+    text: Crackbot is in here.
+        option: ./use cow
                 info: Your cows stampede and many escape. You are squished and die.
                 endgame: You learn IRC is a horrible place with many haters and never join again. You live a lonely life with no friends.
         endoption
-		option: ./use potato
+        option: ./use potato
                 info: You plant the potato in the ground. The potato attacks you.
                 endgame: You learn IRC is a horrible place with many haters and never join again. You live a lonely life with no friends.
-        if: (item(SPAMBOT < 1)
             option: Bring in your own bot
                 item: SPAMBOT+1
             endoption
-        endif
         
-		option: Go back to #powder
-			goto: ;1.2;
-        endoption
+        option: Go back to #powder
+            goto: ;1.2;
+                endoption
 end
 
 ;1.2.1.3;
 
-	text: SPAMBOT joins ##powder-bots
-		option: !spam
+    text: SPAMBOT joins ##powder-bots
+        option: !spam
                 info: The bot starts spamming random obscenities. You get banned.
                 endgame: You learn IRC is a horrible place with many haters and never join again. You live a lonely life with no friends.
         endoption
         
         if: (item(Penguin < 1)
             option: !highlight
-                item: Penguin+1
+                item: penguin+1
             endoption
         endif
         
-		option: Go back to #powder
-			goto: ;1.1;
+        option: Go back to #powder
+            goto: ;1.2;
         endoption
 end
 
 
 ;1.2.1.3.2;
 
-	text: The bot highlights everyone in the channel. Everyone yells at you
-		option: Go back to ##powder-bots
-			goto: ;1.2.1;
+    text: The bot highlights everyone in the channel. Everyone yells at you
+        option: Go back to ##powder-bots
+            goto: ;1.2.1;
         endoption
 end
 
@@ -90,187 +88,187 @@ end
 
 ;1.2.2;
 
-	text: You join a game of werewolf. There are 5 players: Chelsie, ishanyx, no-n, woffle, and you. You are wolf. Everyone is silent.
-		option: kill Chelsie
+    text: You join a game of werewolf. There are 5 players: Chelsie, ishanyx, no-n, woffle, and you. You are wolf. Everyone is silent.
+        option: kill Chelsie
         endoption
-		option: kill ishanyx
+        option: kill ishanyx
         endoption
-		option: kill no-n
+        option: kill no-n
         endoption
-		option: kill woffle
+        option: kill woffle
         endoption
 end
 
 ;1.2.2.1;
 
-	text: The dead body of Chelsie, a villager, is found. Those remaining mourn the tragedy.
-		option: Claim seer
+    text: The dead body of Chelsie, a villager, is found. Those remaining mourn the tragedy.
+        option: Claim seer
         endoption
-		option: Claim seer-safe
+        option: Claim seer-safe
         endoption
-		option: Do nothing
+        option: Do nothing
         endoption
 end
 
 ;1.2.2.1.1;
 
-	text: ishanyx is the real seer and already told no-n he was safe. You are lynched.
-		option: You lose
-			goto: ;wolflynched;
+    text: ishanyx is the real seer and already told no-n he was safe. You are lynched.
+        option: You lose
+            goto: ;wolflynched;
         endoption
 end
 
 ;1.2.2.1.2;
 
-	text: ishanyx says she is the real seer and lynches you.
-		option: Lynch ishanyx back and hope for the best
-			rand: ;wolflynched;|;wolflynched;|;seerlynched;
+    text: ishanyx says she is the real seer and lynches you.
+        option: Lynch ishanyx back and hope for the best
+            rand: ;wolflynched;|;wolflynched;|;seerlynched;
         endoption
 end
 
 ;1.2.2.1.3;
 
-	text: ishanyx claims seer, with no-n being safe. She decies to lynch you.
-		option: You lose
-			goto: ;wolflynched;
+    text: ishanyx claims seer, with no-n being safe. She decies to lynch you.
+        option: You lose
+            goto: ;wolflynched;
         endoption
 end
 
 ;1.2.2.2;
 
-	text: The dead body of ishanyx, a seer, is found. Those remaining mourn the tragedy.
-		option: Claim seer safe and lynch no-n
-			rand: ;1.2.2.2.1;|;1.2.2.2.1;|;1.2.2.2.3;
+    text: The dead body of ishanyx, a seer, is found. Those remaining mourn the tragedy.
+        option: Claim seer safe and lynch no-n
+            rand: ;1.2.2.2.1;|;1.2.2.2.1;|;1.2.2.2.3;
         endoption
-		option: Do nothing
+        option: Do nothing
         endoption
 end
 
 ;1.2.2.2.1;
 
-	text: The villagers, after much debate, finally decide on lynching no-n, who turned out to be... a villager
-		option: kill Chelsie
-			item: potato+1
-			goto: ;winresults;
+    text: The villagers, after much debate, finally decide on lynching no-n, who turned out to be... a villager
+        option: kill Chelsie
+            item: potato+1
+            goto: ;winresults;
         endoption
 end
 
 ;1.2.2.2.2;
 
-	text: Nobody knows what to do so they just lynch you
-		option: You lose
-			goto: ;wolflynched;
+    text: Nobody knows what to do so they just lynch you
+        option: You lose
+            goto: ;wolflynched;
         endoption
 end
 
 ;1.2.2.2.3;
 
-	text: no-n says he is the real seer safe and you get lynched
-		option: You lose
-			goto: ;wolflynched;
+    text: no-n says he is the real seer safe and you get lynched
+        option: You lose
+            goto: ;wolflynched;
         endoption
 end
 
 ;1.2.2.3;
 
-	text: The dead body of no-n, a villager, is found. Those remaining mourn the tragedy.
-		option: Claim seer and lynch ishanyx
+    text: The dead body of no-n, a villager, is found. Those remaining mourn the tragedy.
+        option: Claim seer and lynch ishanyx
         endoption
-		option: Do nothing
-			rand: ;1.2.2.3.2;|;1.2.2.3.3;
+        option: Do nothing
+            rand: ;1.2.2.3.2;|;1.2.2.3.3;
         endoption
 end
 
 ;1.2.2.3.1;
 
-	text: ishanyx also claims seer, and you look slightly suspicious. The village decides to ...
-		option: continue
-			rand: ;wolflynched;|;wolflynched;|;seerlynched;
+    text: ishanyx also claims seer, and you look slightly suspicious. The village decides to ...
+        option: continue
+            rand: ;wolflynched;|;wolflynched;|;seerlynched;
         endoption
 end
 
 ;1.2.2.3.2;
 
-	text: ishanyx claims seer and decides to lynch woffle
-		option: lynch woffle
-			goto: ;wofflelynched;
+    text: ishanyx claims seer and decides to lynch woffle
+        option: lynch woffle
+            goto: ;wofflelynched;
         endoption
 end
 
 ;1.2.2.3.3;
 
-	text: ishanyx claims seer and decides to lynch you
-		option: You lose
-			goto: ;wolflynched;
+    text: ishanyx claims seer and decides to lynch you
+        option: You lose
+            goto: ;wolflynched;
         endoption
 end
 
 ;1.2.2.4;
 
-	text: ishanyx claims seer, and saw no-n as villager
-		option: Claim to be real seer and lynch ishanyx
+    text: ishanyx claims seer, and saw no-n as villager
+        option: Claim to be real seer and lynch ishanyx
         endoption
-		option: Do nothing
-			rand: ;1.2.2.4.2;|;1.2.2.4.3;
+        option: Do nothing
+            rand: ;1.2.2.4.2;|;1.2.2.4.3;
         endoption
 end
 
 ;1.2.2.4.1;
 
-	text: Total fail, nobody believes you and she just lynches you
-		option: You lose
-			goto: ;wolflynched;
+    text: Total fail, nobody believes you and she just lynches you
+        option: You lose
+            goto: ;wolflynched;
         endoption
 end
 
 ;1.2.2.4.2;
 
-	text: ishanyx decides to lynch woffle
-		option: Lynch woffle
-			goto: ;wofflelynched;
+    text: ishanyx decides to lynch woffle
+        option: Lynch woffle
+            goto: ;wofflelynched;
         endoption
 end
 
 ;1.2.2.4.3;
 
-	text: ishanyx decides to lynch you
-		option: You lose
-			goto: ;wolflynched;
+    text: ishanyx decides to lynch you
+        option: You lose
+            goto: ;wolflynched;
         endoption
 end
 
 ;wolflynched;
 
-	text: The villagers, after much debate, finally decide on lynching $(NAME), who turned out to be... a wolf
-		option: Continue
-				info: The wolf was $(NAME). The seer was ishanyx.
-	endgame: You learn IRC is a horrible place with many haters and never join again. You live a lonely life with no friends.
+    text: The villagers, after much debate, finally decide on lynching $(NAME), who turned out to be... a wolf
+        option: Continue
+                info: The wolf was $(NAME). The seer was ishanyx.
+    endgame: You learn IRC is a horrible place with many haters and never join again. You live a lonely life with no friends.
         endoption
 end
 
 ;seerlynched;
 
-	text: The villagers, after much debate, finally decide on lynching ishanyx, who turned out to be... a seer
-		option: kill woffle
-			item: potato+1
-			goto: ;winresults;
+    text: The villagers, after much debate, finally decide on lynching ishanyx, who turned out to be... a seer
+        option: kill woffle
+            item: potato+1
+            goto: ;winresults;
         endoption
 end
 
 ;wofflelynched;
 
-	text: The villagers, after much debate, finally decide on lynching woffle, who turned out to be... a villager
-		option: kill ishanyx
-			item: potato+1
-			goto: ;winresults;
+    text: The villagers, after much debate, finally decide on lynching woffle, who turned out to be... a villager
+        option: kill ishanyx
+            item: potato+1
+            goto: ;winresults;
         endoption
 end
 
 ;winresults;
 
-	text: The wolf was $(NAME). The seer was ishanyx.
-		option: You Win! You recieve a potato and go back to #powder
-			goto: ;1.2;
+    text: The wolf was $(NAME). The seer was ishanyx.
+        option: You Win! You recieve a potato and go back to #powder
+            goto: ;1.2;
         endoption
 end
 
@@ -278,206 +276,207 @@ end
 
 ;1.2.3;
 
-	text: Doxin posts a link to something on imgur.
-		option: Open link
+    text: Doxin posts a link to something on imgur.
+        option: Open link
         endoption
-		option: Ask Doxin what the link is
+        option: Ask Doxin what the link is
         endoption
-		option: Run far, far away
-                	info: You run far away from IRC, never to return again.
-	endgame: You learn IRC is a horrible place with many haters and never join again. You live a lonely life with no friends.
+        option: Run far, far away
+                    info: You run far away from IRC, never to return again.
+    endgame: You learn IRC is a horrible place with many haters and never join again. You live a lonely life with no friends.
         endoption
 end
 
 ;1.2.3.1;
 
-	text: It is a picture of a dildo. You are horrified.
-		option: Yell at Doxin for posting it
-                	info: You shame Doxin for posting such inappropriate pictures in #powder. After a large argument, Mortvert bans both of you.
-	endgame: You learn IRC is a horrible place with many haters and never join again. You live a lonely life with no friends.
+    text: It is a picture of a dildo. You are horrified.
+        option: Yell at Doxin for posting it
+                    info: You shame Doxin for posting such inappropriate pictures in #powder. After a large argument, Mortvert bans both of you.
+    endgame: You learn IRC is a horrible place with many haters and never join again. You live a lonely life with no friends.
         endoption
-		option: Pretend you never saw it
+        option: Pretend you never saw it
         endoption
 end
 
 ;1.2.3.1.2;
 
-	text: You erase this photo from your memory. Something makes you feel like you should have asked what it was ...
-		option: Continue
-			goto: ;1.2;
+    text: You erase this photo from your memory. Something makes you feel like you should have asked what it was ...
+        option: Continue
+            goto: ;1.2;
         endoption
 end
 
 ;1.2.3.2;
 
-	text: Doxin explains that it his his new Dildo. He accidentally ordered an extra though.
-		option: Compliment his dildo
-                	info: NSFW talk is against the rules, everyone flames you and then you get banned.
-	endgame: You learn IRC is a horrible place with many haters and never join again. You live a lonely life with no friends.
+    text: Doxin explains that it his his new Dildo. He accidentally ordered an extra though.
+        option: Compliment his dildo
+                    info: NSFW talk is against the rules, everyone flames you and then you get banned.
+    endgame: You learn IRC is a horrible place with many haters and never join again. You live a lonely life with no friends.
         endoption
-		option: Ask if you can have the extra
+        option: Ask if you can have the extra
         endoption
-		option: Pretend you aren't there
+        option: Pretend you aren't there
         endoption
 end
 
 ;1.2.3.2.2;
 
-	text: Doxin is happy to give you the extra, as long as you become his new boyfriend.
-	item: Dildo+1
-		option: Shudder and go back to #powder
-			goto: ;1.2;
+    text: Doxin is happy to give you the extra, as long as you become his new boyfriend.
+    item: Dildo+1
+        option: Shudder and go back to #powder
+            goto: ;1.2;
         endoption
 end
 
 ;1.2.3.2.3;
 
-	text: Doxin keeps highlighting you constantly, he knows you are really there.
-		option: Hide some more
+    text: Doxin keeps highlighting you constantly, he knows you are really there.
+        option: Hide some more
         endoption
-		option: Tell him to stop highlighting you
-                	info: You tell him to stop talking to you. Everyone flames you because you are being so rude and Doxin only was respectfully talking to you about his dildo.
-	endgame: You learn IRC is a horrible place with many haters and never join again. You live a lonely life with no friends.
+        option: Tell him to stop highlighting you
+                    info: You tell him to stop talking to you. Everyone flames you because you are being so rude and Doxin only was respectfully talking to you about his dildo.
+    endgame: You learn IRC is a horrible place with many haters and never join again. You live a lonely life with no friends.
         endoption
 end
 
 ;1.2.3.2.3.1;
 
-	text: He eventually stops and you can return to normal #powder conversation.
-		option: Continue
-			goto: ;1.2;
+    text: He eventually stops and you can return to normal #powder conversation.
+        option: Continue
+            goto: ;1.2;
         endoption
 end
 
 ;1.2.4;
 
-	text: You idle and wait for something to happen.
-		option: Keep idling
+    text: You idle and wait for something to happen.
+        option: Keep idling
         endoption
-		option: Check for activity
-			goto: ;1.2;
+        option: Check for activity
+            goto: ;1.2;
         endoption
 end
 
 ;1.2.4.1;
 
-	text: You idle and wait for something to happen.
-		option: Keep idling
+    text: You idle and wait for something to happen.
+        option: Keep idling
         endoption
-		option: Check for activity
-			goto: ;1.2;
+        option: Check for activity
+            goto: ;1.2;
         endoption
 end
 
 ;1.2.4.1.1;
 
-	text: You idle and wait for something to happen.
-		option: Keep idling
+    text: You idle and wait for something to happen.
+        option: Keep idling
         endoption
-		option: Check for activity
-			goto: ;1.2;
+        option: Check for activity
+            goto: ;1.2;
         endoption
 end
 
 ;1.2.4.1.1.1;
 
-	text: You idle and wait for something to happen.
-		option: Keep idling
-			item: Coin+1
+    text: You idle and wait for something to happen.
+        option: Keep idling
+            item: Coin+1
             endoption
-		option: Check for activity
-			goto: ;1.2;
+        option: Check for activity
+            goto: ;1.2;
             endoption
 end
 
 ;1.2.4.1.1.1.1;
 
-	text: You found a coin
-		option: Keep idling
-                	info: You idle so long that jacob1 bans you for never talking.
-	endgame: You learn IRC is a horrible place with many haters and never join again. You live a lonely life with no friends.
+    text: You found a coin
+        option: Keep idling
+                    info: You idle so long that jacob1 bans you for never talking.
+    endgame: You learn IRC is a horrible place with many haters and never join again. You live a lonely life with no friends.
 
         endoption
-		option: Check for activity
-			goto: ;1.2;
+        option: Check for activity
+            goto: ;1.2;
         endoption
 end
 
 ;1.2.5;
 
-	text: mniip wants somebody to run a lua script he made in tpt.
-		option: Tell him that you can do it
+    text: mniip wants somebody to run a lua script he made in tpt.
+        option: Tell him that you can do it
         endoption
-		option: Avoid running scripts from evil russian hackers
+        option: Avoid running scripts from evil russian hackers
+        info: You are very curious about what the script does, but go back to #powder anyway.
+                goto: ;1.2;
         endoption
 end
 
 ;1.2.5.1;
 
-	text: He gives you a link to the script.
-		option: Run script
-			info: -1 SESSION_ID
+    text: He gives you a link to the script.
+        option: Run script
+            info: -1 SESSION_ID
         endoption
-		option: Ask how to run the script
+        option: Ask how to run the script
         endoption
-		option: Ask what LUA is
-                	info: You ask mniip about LUA. He is so enraged that you spelled the language of the gods incorrectly that he hacks freenode and bans you from every channel. He then comes to your house, shoots your family, and burns your house down.
-	info: -1 family$(ENDL)-1 house
-	endgame: You learn IRC is a horrible place with many haters and never join again. You live a lonely life with no friends.
+        option: Ask what LUA is
+                    info: You ask mniip about LUA. He is so enraged that you spelled the language of the gods incorrectly that he hacks freenode and bans you from every channel. He then comes to your house, shoots your family, and burns your house down.
+    info: -1 family$(ENDL)-1 house
+    endgame: You learn IRC is a horrible place with many haters and never join again. You live a lonely life with no friends.
 
         endoption
 end
 
 ;1.2.5.1.1;
 
-	text: You run the script. TPT closes. You aren't sure why.
-		option: Continue back to #powder
-			goto: ;1.2;
+    text: You run the script. TPT closes. You aren't sure why.
+        option: Continue back to #powder
+            goto: ;1.2;
         endoption
 end
 
 ;1.2.5.1.2;
 
-	text: mniip tells you that you need Linux to run it.
-		option: Install Linux
-			item: Linux+1
+    text: mniip tells you that you need Linux to run it.
+        option: Install Linux
+            item: Linux+1
         endoption
-		option: Run it anyway
-			goto: ;1.2.5.1.1;
+        option: Run it anyway
+            goto: ;1.2.5.1.1;
         endoption
-		option: Buy a mac
-                	info: You buy a mac. You are forced to sell everything you own to afford it, and when you try to turn it on it burns down your house.
-	info: -1 computer
+        option: Buy a mac
+                    info: You buy a mac. You are forced to sell everything you own to afford it, and when you try to turn it on it burns down your house.
+    info: -1 computer
     info: -1 car
     info: -1 dignity
     info: -1 soul
     info: -1 house
-	endgame: You learn IRC is a horrible place with many haters and never join again. You live a lonely life with no friends.
+    endgame: You learn IRC is a horrible place with many haters and never join again. You live a lonely life with no friends.
 
         endoption
 end
 
 ;1.2.5.1.2.1;
 
-	text: You install Linux. Your computer is now more powerful than the fastest supercomputer
-		option: Return to #powder
-			goto: ;1.2;
+    text: You install Linux. Your computer is now more powerful than the fastest supercomputer
+        option: Return to #powder
+            goto: ;1.2;
         endoption
-		option: Redownload script
+        option: Redownload script
         endoption
 end
 
 ;1.2.5.1.2.1.2;
 
-	text: You download the script
-		option: Run script
-			goto: ;1.2.5.1.1;
+    text: You download the script
+        option: Run script
+            goto: ;1.2.5.1.1;
         endoption
 end
 
 
 ;1.2.5.2;
 
-	text: You are very curious about what the script does, but go back to #powder anyway.
-	goto: ;1.2;
+    
 end

src/checkCondition.cpp

@@ -55,6 +55,8 @@ bool GameController::checkConditionGeneric(int (GameController::*getValueFunctio
         return true;
     else if(currentOperation == ">=" && (this->*getValueFunction)(name) >= stoi(value))
         return true;
+    else if(currentOperation == "<" && (this->*getValueFunction)(name) < stoi(value))
+        return true;
     return false;
 }
 

src/gameController.cpp

@@ -374,6 +374,11 @@ bool GameController::addItem(std::string itemString)
     
     if(not foundPlace)
     {
+        if(std::stoi(amount) > 1)
+            std::cout << "You find " << amount << " " << itemName << "s " << sessionKey << std::endl;
+        else
+            std::cout << "You find " << amount << " " << itemName << " " << sessionKey << std::endl;
+        
         items.push_back(itemName);
         itemsAmount.push_back(std::stoi(amount));
     }
@@ -414,7 +419,7 @@ std::string GameController::getItems()
                 returnString += addAnd + std::to_string(itemsAmount.at(place)) + " " + items.at(place) + "s.";
             else
                 returnString += std::to_string(itemsAmount.at(place)) + " " + items.at(place) + "s, ";
-        } else if(itemsAmount.at(place) == 0) {
+        } else if(itemsAmount.at(place) == 1) {
             if(place == items.size()-1)
                 returnString += addAnd + std::to_string(itemsAmount.at(place)) + " " + items.at(place) + ".";
             else

src/main.cpp

@@ -55,7 +55,7 @@ std::string getUserInput(std::vector<GameContainer*> *mainGameVector, int *gameI
         std::getline(std::cin,userInput);
         
         /////
-        //userInput += " moo|";
+        userInput += " moo|";
         /////
         
         // Input is from user
@@ -133,14 +133,14 @@ int main()
     std::string userInput;
     int gameIndex;
     
-    /*
+    
     mainGameVector.push_back(new GameContainer);
     mainGameVector.at(mainGameVector.size()-1)->game = new GameController("moo"); //moo
     mainGameVector.at(mainGameVector.size()-1)->sessionKey = "moo"; //moo
-    mainGameVector.at(mainGameVector.size()-1)->game->parseFile("irc.txt"); //game.txt
+    mainGameVector.at(mainGameVector.size()-1)->game->parseFile("developper.txt"); //game.txt
     mainGameVector.at(mainGameVector.size()-1)->game->storyline = ";1;"; //;setup;
     printOptions(mainGameVector.size()-1, &mainGameVector);
-    */
+    
     
     while(true)
     {

student.txt

@@ -0,0 +1,56 @@
+;1;
+    text: It's 8am. Your alarm starts going off.
+    option: Get up
+        var: early = true
+        info: You get out of bed
+    endoption
+    option: Sleep through it
+    endoption
+end
+
+;checkSchedule;
+    text: <schedule>
+    option: back
+        goto: $var(back)
+    endoption
+end
+
+;1.1;
+    text: .
+    option: Look around
+        info: You're in your dorm
+        goto: ;1.1;
+    endoption
+    
+    option: Check schedule
+        var: back = ;1.1;
+        goto: ;checkSchedule;
+    endoption
+    
+    if: var(early = true)
+        option: Go to gym
+            goto: ;gym.early;
+        endoption
+    endif
+
+    if: var(early = false)
+        option: Go to gym
+            goto: ;gym.late;
+        endoption
+    endif
+end
+
+;gym.early;
+    text: You get to the gym. It's pretty early, and not many people are here yet
+    option: Go back to dorm
+        var: early = false
+        goto: ;1.1;
+    endoption
+end
+
+;gym.late;
+    text: You get to the gym. It's later in the day, and the gym is completely full
+    option: Go to free weights
+    option: Wait for a machine
+    option: 
+end

webserver/html/playGame.html

@@ -58,7 +58,8 @@
             console.log(data);
             $("#log").append(data);
             $(".mainGame").stop();
-            $(".mainGame").animate({ scrollTop: $(".mainGame").height() }, "slow");
+            $(".mainGame").animate({ scrollTop: $('.mainGame').prop("scrollHeight")}, 1000);
+            
             return false;
         });
     </script>

webserver/irc.txt

@@ -11,27 +11,27 @@
 ////           ////
 
 ;1;
-	text: You are on your computer. You have two IRC clients.
-		option: Start IceChat
+    text: You are on your computer. You have two IRC clients.
+        option: Start IceChat
                     info: Everyone makes fun of you and then your computer explodes.
                     info: -1 Computer
                     endgame: You learn IRC is a horrible place with many haters and never join again. You live a lonely life with no friends.
                 endoption
-		option: Start Hexchat
+        option: Start Hexchat
         endoption
 end
 
 ;1.2;
 
-	text: You join #powder.
-		option: Also join #powder-bots
+    text: You join #powder.
+        option: Also join #powder-bots
         endoption
-		option: Also join ##werewolf
+        option: Also join ##werewolf
         endoption
-		option: Join the conversation
-			rand: ;1.2.3;|;1.2.5;
+        option: Join the conversation
+            rand: ;1.2.3;|;1.2.5;
         endoption
-		option: Idle
+        option: Idle
         endoption
 end
 
@@ -39,50 +39,48 @@ end
 
 ;1.2.1;
 
-	text: Crackbot is in here.
-		option: ./use cow
+    text: Crackbot is in here.
+        option: ./use cow
                 info: Your cows stampede and many escape. You are squished and die.
                 endgame: You learn IRC is a horrible place with many haters and never join again. You live a lonely life with no friends.
         endoption
-		option: ./use potato
+        option: ./use potato
                 info: You plant the potato in the ground. The potato attacks you.
                 endgame: You learn IRC is a horrible place with many haters and never join again. You live a lonely life with no friends.
-        if: (item(SPAMBOT < 1)
             option: Bring in your own bot
                 item: SPAMBOT+1
             endoption
-        endif
         
-		option: Go back to #powder
-			goto: ;1.2;
-        endoption
+        option: Go back to #powder
+            goto: ;1.2;
+                endoption
 end
 
 ;1.2.1.3;
 
-	text: SPAMBOT joins ##powder-bots
-		option: !spam
+    text: SPAMBOT joins ##powder-bots
+        option: !spam
                 info: The bot starts spamming random obscenities. You get banned.
                 endgame: You learn IRC is a horrible place with many haters and never join again. You live a lonely life with no friends.
         endoption
         
         if: (item(Penguin < 1)
             option: !highlight
-                item: Penguin+1
+                item: penguin+1
             endoption
         endif
         
-		option: Go back to #powder
-			goto: ;1.1;
+        option: Go back to #powder
+            goto: ;1.2;
         endoption
 end
 
 
 ;1.2.1.3.2;
 
-	text: The bot highlights everyone in the channel. Everyone yells at you
-		option: Go back to ##powder-bots
-			goto: ;1.2.1;
+    text: The bot highlights everyone in the channel. Everyone yells at you
+        option: Go back to ##powder-bots
+            goto: ;1.2.1;
         endoption
 end
 
@@ -90,187 +88,187 @@ end
 
 ;1.2.2;
 
-	text: You join a game of werewolf. There are 5 players: Chelsie, ishanyx, no-n, woffle, and you. You are wolf. Everyone is silent.
-		option: kill Chelsie
+    text: You join a game of werewolf. There are 5 players: Chelsie, ishanyx, no-n, woffle, and you. You are wolf. Everyone is silent.
+        option: kill Chelsie
         endoption
-		option: kill ishanyx
+        option: kill ishanyx
         endoption
-		option: kill no-n
+        option: kill no-n
         endoption
-		option: kill woffle
+        option: kill woffle
         endoption
 end
 
 ;1.2.2.1;
 
-	text: The dead body of Chelsie, a villager, is found. Those remaining mourn the tragedy.
-		option: Claim seer
+    text: The dead body of Chelsie, a villager, is found. Those remaining mourn the tragedy.
+        option: Claim seer
         endoption
-		option: Claim seer-safe
+        option: Claim seer-safe
         endoption
-		option: Do nothing
+        option: Do nothing
         endoption
 end
 
 ;1.2.2.1.1;
 
-	text: ishanyx is the real seer and already told no-n he was safe. You are lynched.
-		option: You lose
-			goto: ;wolflynched;
+    text: ishanyx is the real seer and already told no-n he was safe. You are lynched.
+        option: You lose
+            goto: ;wolflynched;
         endoption
 end
 
 ;1.2.2.1.2;
 
-	text: ishanyx says she is the real seer and lynches you.
-		option: Lynch ishanyx back and hope for the best
-			rand: ;wolflynched;|;wolflynched;|;seerlynched;
+    text: ishanyx says she is the real seer and lynches you.
+        option: Lynch ishanyx back and hope for the best
+            rand: ;wolflynched;|;wolflynched;|;seerlynched;
         endoption
 end
 
 ;1.2.2.1.3;
 
-	text: ishanyx claims seer, with no-n being safe. She decies to lynch you.
-		option: You lose
-			goto: ;wolflynched;
+    text: ishanyx claims seer, with no-n being safe. She decies to lynch you.
+        option: You lose
+            goto: ;wolflynched;
         endoption
 end
 
 ;1.2.2.2;
 
-	text: The dead body of ishanyx, a seer, is found. Those remaining mourn the tragedy.
-		option: Claim seer safe and lynch no-n
-			rand: ;1.2.2.2.1;|;1.2.2.2.1;|;1.2.2.2.3;
+    text: The dead body of ishanyx, a seer, is found. Those remaining mourn the tragedy.
+        option: Claim seer safe and lynch no-n
+            rand: ;1.2.2.2.1;|;1.2.2.2.1;|;1.2.2.2.3;
         endoption
-		option: Do nothing
+        option: Do nothing
         endoption
 end
 
 ;1.2.2.2.1;
 
-	text: The villagers, after much debate, finally decide on lynching no-n, who turned out to be... a villager
-		option: kill Chelsie
-			item: potato+1
-			goto: ;winresults;
+    text: The villagers, after much debate, finally decide on lynching no-n, who turned out to be... a villager
+        option: kill Chelsie
+            item: potato+1
+            goto: ;winresults;
         endoption
 end
 
 ;1.2.2.2.2;
 
-	text: Nobody knows what to do so they just lynch you
-		option: You lose
-			goto: ;wolflynched;
+    text: Nobody knows what to do so they just lynch you
+        option: You lose
+            goto: ;wolflynched;
         endoption
 end
 
 ;1.2.2.2.3;
 
-	text: no-n says he is the real seer safe and you get lynched
-		option: You lose
-			goto: ;wolflynched;
+    text: no-n says he is the real seer safe and you get lynched
+        option: You lose
+            goto: ;wolflynched;
         endoption
 end
 
 ;1.2.2.3;
 
-	text: The dead body of no-n, a villager, is found. Those remaining mourn the tragedy.
-		option: Claim seer and lynch ishanyx
+    text: The dead body of no-n, a villager, is found. Those remaining mourn the tragedy.
+        option: Claim seer and lynch ishanyx
         endoption
-		option: Do nothing
-			rand: ;1.2.2.3.2;|;1.2.2.3.3;
+        option: Do nothing
+            rand: ;1.2.2.3.2;|;1.2.2.3.3;
         endoption
 end
 
 ;1.2.2.3.1;
 
-	text: ishanyx also claims seer, and you look slightly suspicious. The village decides to ...
-		option: continue
-			rand: ;wolflynched;|;wolflynched;|;seerlynched;
+    text: ishanyx also claims seer, and you look slightly suspicious. The village decides to ...
+        option: continue
+            rand: ;wolflynched;|;wolflynched;|;seerlynched;
         endoption
 end
 
 ;1.2.2.3.2;
 
-	text: ishanyx claims seer and decides to lynch woffle
-		option: lynch woffle
-			goto: ;wofflelynched;
+    text: ishanyx claims seer and decides to lynch woffle
+        option: lynch woffle
+            goto: ;wofflelynched;
         endoption
 end
 
 ;1.2.2.3.3;
 
-	text: ishanyx claims seer and decides to lynch you
-		option: You lose
-			goto: ;wolflynched;
+    text: ishanyx claims seer and decides to lynch you
+        option: You lose
+            goto: ;wolflynched;
         endoption
 end
 
 ;1.2.2.4;
 
-	text: ishanyx claims seer, and saw no-n as villager
-		option: Claim to be real seer and lynch ishanyx
+    text: ishanyx claims seer, and saw no-n as villager
+        option: Claim to be real seer and lynch ishanyx
         endoption
-		option: Do nothing
-			rand: ;1.2.2.4.2;|;1.2.2.4.3;
+        option: Do nothing
+            rand: ;1.2.2.4.2;|;1.2.2.4.3;
         endoption
 end
 
 ;1.2.2.4.1;
 
-	text: Total fail, nobody believes you and she just lynches you
-		option: You lose
-			goto: ;wolflynched;
+    text: Total fail, nobody believes you and she just lynches you
+        option: You lose
+            goto: ;wolflynched;
         endoption
 end
 
 ;1.2.2.4.2;
 
-	text: ishanyx decides to lynch woffle
-		option: Lynch woffle
-			goto: ;wofflelynched;
+    text: ishanyx decides to lynch woffle
+        option: Lynch woffle
+            goto: ;wofflelynched;
         endoption
 end
 
 ;1.2.2.4.3;
 
-	text: ishanyx decides to lynch you
-		option: You lose
-			goto: ;wolflynched;
+    text: ishanyx decides to lynch you
+        option: You lose
+            goto: ;wolflynched;
         endoption
 end
 
 ;wolflynched;
 
-	text: The villagers, after much debate, finally decide on lynching $(NAME), who turned out to be... a wolf
-		option: Continue
-				info: The wolf was $(NAME). The seer was ishanyx.
-	endgame: You learn IRC is a horrible place with many haters and never join again. You live a lonely life with no friends.
+    text: The villagers, after much debate, finally decide on lynching $(NAME), who turned out to be... a wolf
+        option: Continue
+                info: The wolf was $(NAME). The seer was ishanyx.
+    endgame: You learn IRC is a horrible place with many haters and never join again. You live a lonely life with no friends.
         endoption
 end
 
 ;seerlynched;
 
-	text: The villagers, after much debate, finally decide on lynching ishanyx, who turned out to be... a seer
-		option: kill woffle
-			item: potato+1
-			goto: ;winresults;
+    text: The villagers, after much debate, finally decide on lynching ishanyx, who turned out to be... a seer
+        option: kill woffle
+            item: potato+1
+            goto: ;winresults;
         endoption
 end
 
 ;wofflelynched;
 
-	text: The villagers, after much debate, finally decide on lynching woffle, who turned out to be... a villager
-		option: kill ishanyx
-			item: potato+1
-			goto: ;winresults;
+    text: The villagers, after much debate, finally decide on lynching woffle, who turned out to be... a villager
+        option: kill ishanyx
+            item: potato+1
+            goto: ;winresults;
         endoption
 end
 
 ;winresults;
 
-	text: The wolf was $(NAME). The seer was ishanyx.
-		option: You Win! You recieve a potato and go back to #powder
-			goto: ;1.2;
+    text: The wolf was $(NAME). The seer was ishanyx.
+        option: You Win! You recieve a potato and go back to #powder
+            goto: ;1.2;
         endoption
 end
 
@@ -278,206 +276,207 @@ end
 
 ;1.2.3;
 
-	text: Doxin posts a link to something on imgur.
-		option: Open link
+    text: Doxin posts a link to something on imgur.
+        option: Open link
         endoption
-		option: Ask Doxin what the link is
+        option: Ask Doxin what the link is
         endoption
-		option: Run far, far away
-                	info: You run far away from IRC, never to return again.
-	endgame: You learn IRC is a horrible place with many haters and never join again. You live a lonely life with no friends.
+        option: Run far, far away
+                    info: You run far away from IRC, never to return again.
+    endgame: You learn IRC is a horrible place with many haters and never join again. You live a lonely life with no friends.
         endoption
 end
 
 ;1.2.3.1;
 
-	text: It is a picture of a dildo. You are horrified.
-		option: Yell at Doxin for posting it
-                	info: You shame Doxin for posting such inappropriate pictures in #powder. After a large argument, Mortvert bans both of you.
-	endgame: You learn IRC is a horrible place with many haters and never join again. You live a lonely life with no friends.
+    text: It is a picture of a dildo. You are horrified.
+        option: Yell at Doxin for posting it
+                    info: You shame Doxin for posting such inappropriate pictures in #powder. After a large argument, Mortvert bans both of you.
+    endgame: You learn IRC is a horrible place with many haters and never join again. You live a lonely life with no friends.
         endoption
-		option: Pretend you never saw it
+        option: Pretend you never saw it
         endoption
 end
 
 ;1.2.3.1.2;
 
-	text: You erase this photo from your memory. Something makes you feel like you should have asked what it was ...
-		option: Continue
-			goto: ;1.2;
+    text: You erase this photo from your memory. Something makes you feel like you should have asked what it was ...
+        option: Continue
+            goto: ;1.2;
         endoption
 end
 
 ;1.2.3.2;
 
-	text: Doxin explains that it his his new Dildo. He accidentally ordered an extra though.
-		option: Compliment his dildo
-                	info: NSFW talk is against the rules, everyone flames you and then you get banned.
-	endgame: You learn IRC is a horrible place with many haters and never join again. You live a lonely life with no friends.
+    text: Doxin explains that it his his new Dildo. He accidentally ordered an extra though.
+        option: Compliment his dildo
+                    info: NSFW talk is against the rules, everyone flames you and then you get banned.
+    endgame: You learn IRC is a horrible place with many haters and never join again. You live a lonely life with no friends.
         endoption
-		option: Ask if you can have the extra
+        option: Ask if you can have the extra
         endoption
-		option: Pretend you aren't there
+        option: Pretend you aren't there
         endoption
 end
 
 ;1.2.3.2.2;
 
-	text: Doxin is happy to give you the extra, as long as you become his new boyfriend.
-	item: Dildo+1
-		option: Shudder and go back to #powder
-			goto: ;1.2;
+    text: Doxin is happy to give you the extra, as long as you become his new boyfriend.
+    item: Dildo+1
+        option: Shudder and go back to #powder
+            goto: ;1.2;
         endoption
 end
 
 ;1.2.3.2.3;
 
-	text: Doxin keeps highlighting you constantly, he knows you are really there.
-		option: Hide some more
+    text: Doxin keeps highlighting you constantly, he knows you are really there.
+        option: Hide some more
         endoption
-		option: Tell him to stop highlighting you
-                	info: You tell him to stop talking to you. Everyone flames you because you are being so rude and Doxin only was respectfully talking to you about his dildo.
-	endgame: You learn IRC is a horrible place with many haters and never join again. You live a lonely life with no friends.
+        option: Tell him to stop highlighting you
+                    info: You tell him to stop talking to you. Everyone flames you because you are being so rude and Doxin only was respectfully talking to you about his dildo.
+    endgame: You learn IRC is a horrible place with many haters and never join again. You live a lonely life with no friends.
         endoption
 end
 
 ;1.2.3.2.3.1;
 
-	text: He eventually stops and you can return to normal #powder conversation.
-		option: Continue
-			goto: ;1.2;
+    text: He eventually stops and you can return to normal #powder conversation.
+        option: Continue
+            goto: ;1.2;
         endoption
 end
 
 ;1.2.4;
 
-	text: You idle and wait for something to happen.
-		option: Keep idling
+    text: You idle and wait for something to happen.
+        option: Keep idling
         endoption
-		option: Check for activity
-			goto: ;1.2;
+        option: Check for activity
+            goto: ;1.2;
         endoption
 end
 
 ;1.2.4.1;
 
-	text: You idle and wait for something to happen.
-		option: Keep idling
+    text: You idle and wait for something to happen.
+        option: Keep idling
         endoption
-		option: Check for activity
-			goto: ;1.2;
+        option: Check for activity
+            goto: ;1.2;
         endoption
 end
 
 ;1.2.4.1.1;
 
-	text: You idle and wait for something to happen.
-		option: Keep idling
+    text: You idle and wait for something to happen.
+        option: Keep idling
         endoption
-		option: Check for activity
-			goto: ;1.2;
+        option: Check for activity
+            goto: ;1.2;
         endoption
 end
 
 ;1.2.4.1.1.1;
 
-	text: You idle and wait for something to happen.
-		option: Keep idling
-			item: Coin+1
+    text: You idle and wait for something to happen.
+        option: Keep idling
+            item: Coin+1
             endoption
-		option: Check for activity
-			goto: ;1.2;
+        option: Check for activity
+            goto: ;1.2;
             endoption
 end
 
 ;1.2.4.1.1.1.1;
 
-	text: You found a coin
-		option: Keep idling
-                	info: You idle so long that jacob1 bans you for never talking.
-	endgame: You learn IRC is a horrible place with many haters and never join again. You live a lonely life with no friends.
+    text: You found a coin
+        option: Keep idling
+                    info: You idle so long that jacob1 bans you for never talking.
+    endgame: You learn IRC is a horrible place with many haters and never join again. You live a lonely life with no friends.
 
         endoption
-		option: Check for activity
-			goto: ;1.2;
+        option: Check for activity
+            goto: ;1.2;
         endoption
 end
 
 ;1.2.5;
 
-	text: mniip wants somebody to run a lua script he made in tpt.
-		option: Tell him that you can do it
+    text: mniip wants somebody to run a lua script he made in tpt.
+        option: Tell him that you can do it
         endoption
-		option: Avoid running scripts from evil russian hackers
+        option: Avoid running scripts from evil russian hackers
+        info: You are very curious about what the script does, but go back to #powder anyway.
+                goto: ;1.2;
         endoption
 end
 
 ;1.2.5.1;
 
-	text: He gives you a link to the script.
-		option: Run script
-			info: -1 SESSION_ID
+    text: He gives you a link to the script.
+        option: Run script
+            info: -1 SESSION_ID
         endoption
-		option: Ask how to run the script
+        option: Ask how to run the script
         endoption
-		option: Ask what LUA is
-                	info: You ask mniip about LUA. He is so enraged that you spelled the language of the gods incorrectly that he hacks freenode and bans you from every channel. He then comes to your house, shoots your family, and burns your house down.
-	info: -1 family$(ENDL)-1 house
-	endgame: You learn IRC is a horrible place with many haters and never join again. You live a lonely life with no friends.
+        option: Ask what LUA is
+                    info: You ask mniip about LUA. He is so enraged that you spelled the language of the gods incorrectly that he hacks freenode and bans you from every channel. He then comes to your house, shoots your family, and burns your house down.
+    info: -1 family$(ENDL)-1 house
+    endgame: You learn IRC is a horrible place with many haters and never join again. You live a lonely life with no friends.
 
         endoption
 end
 
 ;1.2.5.1.1;
 
-	text: You run the script. TPT closes. You aren't sure why.
-		option: Continue back to #powder
-			goto: ;1.2;
+    text: You run the script. TPT closes. You aren't sure why.
+        option: Continue back to #powder
+            goto: ;1.2;
         endoption
 end
 
 ;1.2.5.1.2;
 
-	text: mniip tells you that you need Linux to run it.
-		option: Install Linux
-			item: Linux+1
+    text: mniip tells you that you need Linux to run it.
+        option: Install Linux
+            item: Linux+1
         endoption
-		option: Run it anyway
-			goto: ;1.2.5.1.1;
+        option: Run it anyway
+            goto: ;1.2.5.1.1;
         endoption
-		option: Buy a mac
-                	info: You buy a mac. You are forced to sell everything you own to afford it, and when you try to turn it on it burns down your house.
-	info: -1 computer
+        option: Buy a mac
+                    info: You buy a mac. You are forced to sell everything you own to afford it, and when you try to turn it on it burns down your house.
+    info: -1 computer
     info: -1 car
     info: -1 dignity
     info: -1 soul
     info: -1 house
-	endgame: You learn IRC is a horrible place with many haters and never join again. You live a lonely life with no friends.
+    endgame: You learn IRC is a horrible place with many haters and never join again. You live a lonely life with no friends.
 
         endoption
 end
 
 ;1.2.5.1.2.1;
 
-	text: You install Linux. Your computer is now more powerful than the fastest supercomputer
-		option: Return to #powder
-			goto: ;1.2;
+    text: You install Linux. Your computer is now more powerful than the fastest supercomputer
+        option: Return to #powder
+            goto: ;1.2;
         endoption
-		option: Redownload script
+        option: Redownload script
         endoption
 end
 
 ;1.2.5.1.2.1.2;
 
-	text: You download the script
-		option: Run script
-			goto: ;1.2.5.1.1;
+    text: You download the script
+        option: Run script
+            goto: ;1.2.5.1.1;
         endoption
 end
 
 
 ;1.2.5.2;
 
-	text: You are very curious about what the script does, but go back to #powder anyway.
-	goto: ;1.2;
+    
 end