Browse Source

Bug fixes

iam 11 months ago
parent
commit
20bb91d0e0
8 changed files with 441 additions and 376 deletions
  1. 3 0
      developper.txt
  2. 184 185
      irc.txt
  3. 2 0
      src/checkCondition.cpp
  4. 6 1
      src/gameController.cpp
  5. 4 4
      src/main.cpp
  6. 56 0
      student.txt
  7. 2 1
      webserver/html/playGame.html
  8. 184 185
      webserver/irc.txt

+ 3 - 0
developper.txt

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

+ 184 - 185
irc.txt

@@ -11,27 +11,27 @@
11 11
 ////           ////
12 12
 
13 13
 ;1;
14
-	text: You are on your computer. You have two IRC clients.
15
-		option: Start IceChat
14
+    text: You are on your computer. You have two IRC clients.
15
+        option: Start IceChat
16 16
                     info: Everyone makes fun of you and then your computer explodes.
17 17
                     info: -1 Computer
18 18
                     endgame: You learn IRC is a horrible place with many haters and never join again. You live a lonely life with no friends.
19 19
                 endoption
20
-		option: Start Hexchat
20
+        option: Start Hexchat
21 21
         endoption
22 22
 end
23 23
 
24 24
 ;1.2;
25 25
 
26
-	text: You join #powder.
27
-		option: Also join #powder-bots
26
+    text: You join #powder.
27
+        option: Also join #powder-bots
28 28
         endoption
29
-		option: Also join ##werewolf
29
+        option: Also join ##werewolf
30 30
         endoption
31
-		option: Join the conversation
32
-			rand: ;1.2.3;|;1.2.5;
31
+        option: Join the conversation
32
+            rand: ;1.2.3;|;1.2.5;
33 33
         endoption
34
-		option: Idle
34
+        option: Idle
35 35
         endoption
36 36
 end
37 37
 
@@ -39,50 +39,48 @@ end
39 39
 
40 40
 ;1.2.1;
41 41
 
42
-	text: Crackbot is in here.
43
-		option: ./use cow
42
+    text: Crackbot is in here.
43
+        option: ./use cow
44 44
                 info: Your cows stampede and many escape. You are squished and die.
45 45
                 endgame: You learn IRC is a horrible place with many haters and never join again. You live a lonely life with no friends.
46 46
         endoption
47
-		option: ./use potato
47
+        option: ./use potato
48 48
                 info: You plant the potato in the ground. The potato attacks you.
49 49
                 endgame: You learn IRC is a horrible place with many haters and never join again. You live a lonely life with no friends.
50
-        if: (item(SPAMBOT < 1)
51 50
             option: Bring in your own bot
52 51
                 item: SPAMBOT+1
53 52
             endoption
54
-        endif
55 53
         
56
-		option: Go back to #powder
57
-			goto: ;1.2;
58
-        endoption
54
+        option: Go back to #powder
55
+            goto: ;1.2;
56
+                endoption
59 57
 end
60 58
 
61 59
 ;1.2.1.3;
62 60
 
63
-	text: SPAMBOT joins ##powder-bots
64
-		option: !spam
61
+    text: SPAMBOT joins ##powder-bots
62
+        option: !spam
65 63
                 info: The bot starts spamming random obscenities. You get banned.
66 64
                 endgame: You learn IRC is a horrible place with many haters and never join again. You live a lonely life with no friends.
67 65
         endoption
68 66
         
69 67
         if: (item(Penguin < 1)
70 68
             option: !highlight
71
-                item: Penguin+1
69
+                item: penguin+1
72 70
             endoption
73 71
         endif
74 72
         
75
-		option: Go back to #powder
76
-			goto: ;1.1;
73
+        option: Go back to #powder
74
+            goto: ;1.2;
77 75
         endoption
78 76
 end
79 77
 
80 78
 
81 79
 ;1.2.1.3.2;
82 80
 
83
-	text: The bot highlights everyone in the channel. Everyone yells at you
84
-		option: Go back to ##powder-bots
85
-			goto: ;1.2.1;
81
+    text: The bot highlights everyone in the channel. Everyone yells at you
82
+        option: Go back to ##powder-bots
83
+            goto: ;1.2.1;
86 84
         endoption
87 85
 end
88 86
 
@@ -90,187 +88,187 @@ end
90 88
 
91 89
 ;1.2.2;
92 90
 
93
-	text: You join a game of werewolf. There are 5 players: Chelsie, ishanyx, no-n, woffle, and you. You are wolf. Everyone is silent.
94
-		option: kill Chelsie
91
+    text: You join a game of werewolf. There are 5 players: Chelsie, ishanyx, no-n, woffle, and you. You are wolf. Everyone is silent.
92
+        option: kill Chelsie
95 93
         endoption
96
-		option: kill ishanyx
94
+        option: kill ishanyx
97 95
         endoption
98
-		option: kill no-n
96
+        option: kill no-n
99 97
         endoption
100
-		option: kill woffle
98
+        option: kill woffle
101 99
         endoption
102 100
 end
103 101
 
104 102
 ;1.2.2.1;
105 103
 
106
-	text: The dead body of Chelsie, a villager, is found. Those remaining mourn the tragedy.
107
-		option: Claim seer
104
+    text: The dead body of Chelsie, a villager, is found. Those remaining mourn the tragedy.
105
+        option: Claim seer
108 106
         endoption
109
-		option: Claim seer-safe
107
+        option: Claim seer-safe
110 108
         endoption
111
-		option: Do nothing
109
+        option: Do nothing
112 110
         endoption
113 111
 end
114 112
 
115 113
 ;1.2.2.1.1;
116 114
 
117
-	text: ishanyx is the real seer and already told no-n he was safe. You are lynched.
118
-		option: You lose
119
-			goto: ;wolflynched;
115
+    text: ishanyx is the real seer and already told no-n he was safe. You are lynched.
116
+        option: You lose
117
+            goto: ;wolflynched;
120 118
         endoption
121 119
 end
122 120
 
123 121
 ;1.2.2.1.2;
124 122
 
125
-	text: ishanyx says she is the real seer and lynches you.
126
-		option: Lynch ishanyx back and hope for the best
127
-			rand: ;wolflynched;|;wolflynched;|;seerlynched;
123
+    text: ishanyx says she is the real seer and lynches you.
124
+        option: Lynch ishanyx back and hope for the best
125
+            rand: ;wolflynched;|;wolflynched;|;seerlynched;
128 126
         endoption
129 127
 end
130 128
 
131 129
 ;1.2.2.1.3;
132 130
 
133
-	text: ishanyx claims seer, with no-n being safe. She decies to lynch you.
134
-		option: You lose
135
-			goto: ;wolflynched;
131
+    text: ishanyx claims seer, with no-n being safe. She decies to lynch you.
132
+        option: You lose
133
+            goto: ;wolflynched;
136 134
         endoption
137 135
 end
138 136
 
139 137
 ;1.2.2.2;
140 138
 
141
-	text: The dead body of ishanyx, a seer, is found. Those remaining mourn the tragedy.
142
-		option: Claim seer safe and lynch no-n
143
-			rand: ;1.2.2.2.1;|;1.2.2.2.1;|;1.2.2.2.3;
139
+    text: The dead body of ishanyx, a seer, is found. Those remaining mourn the tragedy.
140
+        option: Claim seer safe and lynch no-n
141
+            rand: ;1.2.2.2.1;|;1.2.2.2.1;|;1.2.2.2.3;
144 142
         endoption
145
-		option: Do nothing
143
+        option: Do nothing
146 144
         endoption
147 145
 end
148 146
 
149 147
 ;1.2.2.2.1;
150 148
 
151
-	text: The villagers, after much debate, finally decide on lynching no-n, who turned out to be... a villager
152
-		option: kill Chelsie
153
-			item: potato+1
154
-			goto: ;winresults;
149
+    text: The villagers, after much debate, finally decide on lynching no-n, who turned out to be... a villager
150
+        option: kill Chelsie
151
+            item: potato+1
152
+            goto: ;winresults;
155 153
         endoption
156 154
 end
157 155
 
158 156
 ;1.2.2.2.2;
159 157
 
160
-	text: Nobody knows what to do so they just lynch you
161
-		option: You lose
162
-			goto: ;wolflynched;
158
+    text: Nobody knows what to do so they just lynch you
159
+        option: You lose
160
+            goto: ;wolflynched;
163 161
         endoption
164 162
 end
165 163
 
166 164
 ;1.2.2.2.3;
167 165
 
168
-	text: no-n says he is the real seer safe and you get lynched
169
-		option: You lose
170
-			goto: ;wolflynched;
166
+    text: no-n says he is the real seer safe and you get lynched
167
+        option: You lose
168
+            goto: ;wolflynched;
171 169
         endoption
172 170
 end
173 171
 
174 172
 ;1.2.2.3;
175 173
 
176
-	text: The dead body of no-n, a villager, is found. Those remaining mourn the tragedy.
177
-		option: Claim seer and lynch ishanyx
174
+    text: The dead body of no-n, a villager, is found. Those remaining mourn the tragedy.
175
+        option: Claim seer and lynch ishanyx
178 176
         endoption
179
-		option: Do nothing
180
-			rand: ;1.2.2.3.2;|;1.2.2.3.3;
177
+        option: Do nothing
178
+            rand: ;1.2.2.3.2;|;1.2.2.3.3;
181 179
         endoption
182 180
 end
183 181
 
184 182
 ;1.2.2.3.1;
185 183
 
186
-	text: ishanyx also claims seer, and you look slightly suspicious. The village decides to ...
187
-		option: continue
188
-			rand: ;wolflynched;|;wolflynched;|;seerlynched;
184
+    text: ishanyx also claims seer, and you look slightly suspicious. The village decides to ...
185
+        option: continue
186
+            rand: ;wolflynched;|;wolflynched;|;seerlynched;
189 187
         endoption
190 188
 end
191 189
 
192 190
 ;1.2.2.3.2;
193 191
 
194
-	text: ishanyx claims seer and decides to lynch woffle
195
-		option: lynch woffle
196
-			goto: ;wofflelynched;
192
+    text: ishanyx claims seer and decides to lynch woffle
193
+        option: lynch woffle
194
+            goto: ;wofflelynched;
197 195
         endoption
198 196
 end
199 197
 
200 198
 ;1.2.2.3.3;
201 199
 
202
-	text: ishanyx claims seer and decides to lynch you
203
-		option: You lose
204
-			goto: ;wolflynched;
200
+    text: ishanyx claims seer and decides to lynch you
201
+        option: You lose
202
+            goto: ;wolflynched;
205 203
         endoption
206 204
 end
207 205
 
208 206
 ;1.2.2.4;
209 207
 
210
-	text: ishanyx claims seer, and saw no-n as villager
211
-		option: Claim to be real seer and lynch ishanyx
208
+    text: ishanyx claims seer, and saw no-n as villager
209
+        option: Claim to be real seer and lynch ishanyx
212 210
         endoption
213
-		option: Do nothing
214
-			rand: ;1.2.2.4.2;|;1.2.2.4.3;
211
+        option: Do nothing
212
+            rand: ;1.2.2.4.2;|;1.2.2.4.3;
215 213
         endoption
216 214
 end
217 215
 
218 216
 ;1.2.2.4.1;
219 217
 
220
-	text: Total fail, nobody believes you and she just lynches you
221
-		option: You lose
222
-			goto: ;wolflynched;
218
+    text: Total fail, nobody believes you and she just lynches you
219
+        option: You lose
220
+            goto: ;wolflynched;
223 221
         endoption
224 222
 end
225 223
 
226 224
 ;1.2.2.4.2;
227 225
 
228
-	text: ishanyx decides to lynch woffle
229
-		option: Lynch woffle
230
-			goto: ;wofflelynched;
226
+    text: ishanyx decides to lynch woffle
227
+        option: Lynch woffle
228
+            goto: ;wofflelynched;
231 229
         endoption
232 230
 end
233 231
 
234 232
 ;1.2.2.4.3;
235 233
 
236
-	text: ishanyx decides to lynch you
237
-		option: You lose
238
-			goto: ;wolflynched;
234
+    text: ishanyx decides to lynch you
235
+        option: You lose
236
+            goto: ;wolflynched;
239 237
         endoption
240 238
 end
241 239
 
242 240
 ;wolflynched;
243 241
 
244
-	text: The villagers, after much debate, finally decide on lynching $(NAME), who turned out to be... a wolf
245
-		option: Continue
246
-				info: The wolf was $(NAME). The seer was ishanyx.
247
-	endgame: You learn IRC is a horrible place with many haters and never join again. You live a lonely life with no friends.
242
+    text: The villagers, after much debate, finally decide on lynching $(NAME), who turned out to be... a wolf
243
+        option: Continue
244
+                info: The wolf was $(NAME). The seer was ishanyx.
245
+    endgame: You learn IRC is a horrible place with many haters and never join again. You live a lonely life with no friends.
248 246
         endoption
249 247
 end
250 248
 
251 249
 ;seerlynched;
252 250
 
253
-	text: The villagers, after much debate, finally decide on lynching ishanyx, who turned out to be... a seer
254
-		option: kill woffle
255
-			item: potato+1
256
-			goto: ;winresults;
251
+    text: The villagers, after much debate, finally decide on lynching ishanyx, who turned out to be... a seer
252
+        option: kill woffle
253
+            item: potato+1
254
+            goto: ;winresults;
257 255
         endoption
258 256
 end
259 257
 
260 258
 ;wofflelynched;
261 259
 
262
-	text: The villagers, after much debate, finally decide on lynching woffle, who turned out to be... a villager
263
-		option: kill ishanyx
264
-			item: potato+1
265
-			goto: ;winresults;
260
+    text: The villagers, after much debate, finally decide on lynching woffle, who turned out to be... a villager
261
+        option: kill ishanyx
262
+            item: potato+1
263
+            goto: ;winresults;
266 264
         endoption
267 265
 end
268 266
 
269 267
 ;winresults;
270 268
 
271
-	text: The wolf was $(NAME). The seer was ishanyx.
272
-		option: You Win! You recieve a potato and go back to #powder
273
-			goto: ;1.2;
269
+    text: The wolf was $(NAME). The seer was ishanyx.
270
+        option: You Win! You recieve a potato and go back to #powder
271
+            goto: ;1.2;
274 272
         endoption
275 273
 end
276 274
 
@@ -278,206 +276,207 @@ end
278 276
 
279 277
 ;1.2.3;
280 278
 
281
-	text: Doxin posts a link to something on imgur.
282
-		option: Open link
279
+    text: Doxin posts a link to something on imgur.
280
+        option: Open link
283 281
         endoption
284
-		option: Ask Doxin what the link is
282
+        option: Ask Doxin what the link is
285 283
         endoption
286
-		option: Run far, far away
287
-                	info: You run far away from IRC, never to return again.
288
-	endgame: You learn IRC is a horrible place with many haters and never join again. You live a lonely life with no friends.
284
+        option: Run far, far away
285
+                    info: You run far away from IRC, never to return again.
286
+    endgame: You learn IRC is a horrible place with many haters and never join again. You live a lonely life with no friends.
289 287
         endoption
290 288
 end
291 289
 
292 290
 ;1.2.3.1;
293 291
 
294
-	text: It is a picture of a dildo. You are horrified.
295
-		option: Yell at Doxin for posting it
296
-                	info: You shame Doxin for posting such inappropriate pictures in #powder. After a large argument, Mortvert bans both of you.
297
-	endgame: You learn IRC is a horrible place with many haters and never join again. You live a lonely life with no friends.
292
+    text: It is a picture of a dildo. You are horrified.
293
+        option: Yell at Doxin for posting it
294
+                    info: You shame Doxin for posting such inappropriate pictures in #powder. After a large argument, Mortvert bans both of you.
295
+    endgame: You learn IRC is a horrible place with many haters and never join again. You live a lonely life with no friends.
298 296
         endoption
299
-		option: Pretend you never saw it
297
+        option: Pretend you never saw it
300 298
         endoption
301 299
 end
302 300
 
303 301
 ;1.2.3.1.2;
304 302
 
305
-	text: You erase this photo from your memory. Something makes you feel like you should have asked what it was ...
306
-		option: Continue
307
-			goto: ;1.2;
303
+    text: You erase this photo from your memory. Something makes you feel like you should have asked what it was ...
304
+        option: Continue
305
+            goto: ;1.2;
308 306
         endoption
309 307
 end
310 308
 
311 309
 ;1.2.3.2;
312 310
 
313
-	text: Doxin explains that it his his new Dildo. He accidentally ordered an extra though.
314
-		option: Compliment his dildo
315
-                	info: NSFW talk is against the rules, everyone flames you and then you get banned.
316
-	endgame: You learn IRC is a horrible place with many haters and never join again. You live a lonely life with no friends.
311
+    text: Doxin explains that it his his new Dildo. He accidentally ordered an extra though.
312
+        option: Compliment his dildo
313
+                    info: NSFW talk is against the rules, everyone flames you and then you get banned.
314
+    endgame: You learn IRC is a horrible place with many haters and never join again. You live a lonely life with no friends.
317 315
         endoption
318
-		option: Ask if you can have the extra
316
+        option: Ask if you can have the extra
319 317
         endoption
320
-		option: Pretend you aren't there
318
+        option: Pretend you aren't there
321 319
         endoption
322 320
 end
323 321
 
324 322
 ;1.2.3.2.2;
325 323
 
326
-	text: Doxin is happy to give you the extra, as long as you become his new boyfriend.
327
-	item: Dildo+1
328
-		option: Shudder and go back to #powder
329
-			goto: ;1.2;
324
+    text: Doxin is happy to give you the extra, as long as you become his new boyfriend.
325
+    item: Dildo+1
326
+        option: Shudder and go back to #powder
327
+            goto: ;1.2;
330 328
         endoption
331 329
 end
332 330
 
333 331
 ;1.2.3.2.3;
334 332
 
335
-	text: Doxin keeps highlighting you constantly, he knows you are really there.
336
-		option: Hide some more
333
+    text: Doxin keeps highlighting you constantly, he knows you are really there.
334
+        option: Hide some more
337 335
         endoption
338
-		option: Tell him to stop highlighting you
339
-                	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.
340
-	endgame: You learn IRC is a horrible place with many haters and never join again. You live a lonely life with no friends.
336
+        option: Tell him to stop highlighting you
337
+                    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.
338
+    endgame: You learn IRC is a horrible place with many haters and never join again. You live a lonely life with no friends.
341 339
         endoption
342 340
 end
343 341
 
344 342
 ;1.2.3.2.3.1;
345 343
 
346
-	text: He eventually stops and you can return to normal #powder conversation.
347
-		option: Continue
348
-			goto: ;1.2;
344
+    text: He eventually stops and you can return to normal #powder conversation.
345
+        option: Continue
346
+            goto: ;1.2;
349 347
         endoption
350 348
 end
351 349
 
352 350
 ;1.2.4;
353 351
 
354
-	text: You idle and wait for something to happen.
355
-		option: Keep idling
352
+    text: You idle and wait for something to happen.
353
+        option: Keep idling
356 354
         endoption
357
-		option: Check for activity
358
-			goto: ;1.2;
355
+        option: Check for activity
356
+            goto: ;1.2;
359 357
         endoption
360 358
 end
361 359
 
362 360
 ;1.2.4.1;
363 361
 
364
-	text: You idle and wait for something to happen.
365
-		option: Keep idling
362
+    text: You idle and wait for something to happen.
363
+        option: Keep idling
366 364
         endoption
367
-		option: Check for activity
368
-			goto: ;1.2;
365
+        option: Check for activity
366
+            goto: ;1.2;
369 367
         endoption
370 368
 end
371 369
 
372 370
 ;1.2.4.1.1;
373 371
 
374
-	text: You idle and wait for something to happen.
375
-		option: Keep idling
372
+    text: You idle and wait for something to happen.
373
+        option: Keep idling
376 374
         endoption
377
-		option: Check for activity
378
-			goto: ;1.2;
375
+        option: Check for activity
376
+            goto: ;1.2;
379 377
         endoption
380 378
 end
381 379
 
382 380
 ;1.2.4.1.1.1;
383 381
 
384
-	text: You idle and wait for something to happen.
385
-		option: Keep idling
386
-			item: Coin+1
382
+    text: You idle and wait for something to happen.
383
+        option: Keep idling
384
+            item: Coin+1
387 385
             endoption
388
-		option: Check for activity
389
-			goto: ;1.2;
386
+        option: Check for activity
387
+            goto: ;1.2;
390 388
             endoption
391 389
 end
392 390
 
393 391
 ;1.2.4.1.1.1.1;
394 392
 
395
-	text: You found a coin
396
-		option: Keep idling
397
-                	info: You idle so long that jacob1 bans you for never talking.
398
-	endgame: You learn IRC is a horrible place with many haters and never join again. You live a lonely life with no friends.
393
+    text: You found a coin
394
+        option: Keep idling
395
+                    info: You idle so long that jacob1 bans you for never talking.
396
+    endgame: You learn IRC is a horrible place with many haters and never join again. You live a lonely life with no friends.
399 397
 
400 398
         endoption
401
-		option: Check for activity
402
-			goto: ;1.2;
399
+        option: Check for activity
400
+            goto: ;1.2;
403 401
         endoption
404 402
 end
405 403
 
406 404
 ;1.2.5;
407 405
 
408
-	text: mniip wants somebody to run a lua script he made in tpt.
409
-		option: Tell him that you can do it
406
+    text: mniip wants somebody to run a lua script he made in tpt.
407
+        option: Tell him that you can do it
410 408
         endoption
411
-		option: Avoid running scripts from evil russian hackers
409
+        option: Avoid running scripts from evil russian hackers
410
+        info: You are very curious about what the script does, but go back to #powder anyway.
411
+                goto: ;1.2;
412 412
         endoption
413 413
 end
414 414
 
415 415
 ;1.2.5.1;
416 416
 
417
-	text: He gives you a link to the script.
418
-		option: Run script
419
-			info: -1 SESSION_ID
417
+    text: He gives you a link to the script.
418
+        option: Run script
419
+            info: -1 SESSION_ID
420 420
         endoption
421
-		option: Ask how to run the script
421
+        option: Ask how to run the script
422 422
         endoption
423
-		option: Ask what LUA is
424
-                	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.
425
-	info: -1 family$(ENDL)-1 house
426
-	endgame: You learn IRC is a horrible place with many haters and never join again. You live a lonely life with no friends.
423
+        option: Ask what LUA is
424
+                    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.
425
+    info: -1 family$(ENDL)-1 house
426
+    endgame: You learn IRC is a horrible place with many haters and never join again. You live a lonely life with no friends.
427 427
 
428 428
         endoption
429 429
 end
430 430
 
431 431
 ;1.2.5.1.1;
432 432
 
433
-	text: You run the script. TPT closes. You aren't sure why.
434
-		option: Continue back to #powder
435
-			goto: ;1.2;
433
+    text: You run the script. TPT closes. You aren't sure why.
434
+        option: Continue back to #powder
435
+            goto: ;1.2;
436 436
         endoption
437 437
 end
438 438
 
439 439
 ;1.2.5.1.2;
440 440
 
441
-	text: mniip tells you that you need Linux to run it.
442
-		option: Install Linux
443
-			item: Linux+1
441
+    text: mniip tells you that you need Linux to run it.
442
+        option: Install Linux
443
+            item: Linux+1
444 444
         endoption
445
-		option: Run it anyway
446
-			goto: ;1.2.5.1.1;
445
+        option: Run it anyway
446
+            goto: ;1.2.5.1.1;
447 447
         endoption
448
-		option: Buy a mac
449
-                	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.
450
-	info: -1 computer
448
+        option: Buy a mac
449
+                    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.
450
+    info: -1 computer
451 451
     info: -1 car
452 452
     info: -1 dignity
453 453
     info: -1 soul
454 454
     info: -1 house
455
-	endgame: You learn IRC is a horrible place with many haters and never join again. You live a lonely life with no friends.
455
+    endgame: You learn IRC is a horrible place with many haters and never join again. You live a lonely life with no friends.
456 456
 
457 457
         endoption
458 458
 end
459 459
 
460 460
 ;1.2.5.1.2.1;
461 461
 
462
-	text: You install Linux. Your computer is now more powerful than the fastest supercomputer
463
-		option: Return to #powder
464
-			goto: ;1.2;
462
+    text: You install Linux. Your computer is now more powerful than the fastest supercomputer
463
+        option: Return to #powder
464
+            goto: ;1.2;
465 465
         endoption
466
-		option: Redownload script
466
+        option: Redownload script
467 467
         endoption
468 468
 end
469 469
 
470 470
 ;1.2.5.1.2.1.2;
471 471
 
472
-	text: You download the script
473
-		option: Run script
474
-			goto: ;1.2.5.1.1;
472
+    text: You download the script
473
+        option: Run script
474
+            goto: ;1.2.5.1.1;
475 475
         endoption
476 476
 end
477 477
 
478 478
 
479 479
 ;1.2.5.2;
480 480
 
481
-	text: You are very curious about what the script does, but go back to #powder anyway.
482
-	goto: ;1.2;
481
+    
483 482
 end

+ 2 - 0
src/checkCondition.cpp

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

+ 6 - 1
src/gameController.cpp

@@ -374,6 +374,11 @@ bool GameController::addItem(std::string itemString)
374 374
     
375 375
     if(not foundPlace)
376 376
     {
377
+        if(std::stoi(amount) > 1)
378
+            std::cout << "You find " << amount << " " << itemName << "s " << sessionKey << std::endl;
379
+        else
380
+            std::cout << "You find " << amount << " " << itemName << " " << sessionKey << std::endl;
381
+        
377 382
         items.push_back(itemName);
378 383
         itemsAmount.push_back(std::stoi(amount));
379 384
     }
@@ -414,7 +419,7 @@ std::string GameController::getItems()
414 419
                 returnString += addAnd + std::to_string(itemsAmount.at(place)) + " " + items.at(place) + "s.";
415 420
             else
416 421
                 returnString += std::to_string(itemsAmount.at(place)) + " " + items.at(place) + "s, ";
417
-        } else if(itemsAmount.at(place) == 0) {
422
+        } else if(itemsAmount.at(place) == 1) {
418 423
             if(place == items.size()-1)
419 424
                 returnString += addAnd + std::to_string(itemsAmount.at(place)) + " " + items.at(place) + ".";
420 425
             else

+ 4 - 4
src/main.cpp

@@ -55,7 +55,7 @@ std::string getUserInput(std::vector<GameContainer*> *mainGameVector, int *gameI
55 55
         std::getline(std::cin,userInput);
56 56
         
57 57
         /////
58
-        //userInput += " moo|";
58
+        userInput += " moo|";
59 59
         /////
60 60
         
61 61
         // Input is from user
@@ -133,14 +133,14 @@ int main()
133 133
     std::string userInput;
134 134
     int gameIndex;
135 135
     
136
-    /*
136
+    
137 137
     mainGameVector.push_back(new GameContainer);
138 138
     mainGameVector.at(mainGameVector.size()-1)->game = new GameController("moo"); //moo
139 139
     mainGameVector.at(mainGameVector.size()-1)->sessionKey = "moo"; //moo
140
-    mainGameVector.at(mainGameVector.size()-1)->game->parseFile("irc.txt"); //game.txt
140
+    mainGameVector.at(mainGameVector.size()-1)->game->parseFile("developper.txt"); //game.txt
141 141
     mainGameVector.at(mainGameVector.size()-1)->game->storyline = ";1;"; //;setup;
142 142
     printOptions(mainGameVector.size()-1, &mainGameVector);
143
-    */
143
+    
144 144
     
145 145
     while(true)
146 146
     {

+ 56 - 0
student.txt

@@ -0,0 +1,56 @@
1
+;1;
2
+    text: It's 8am. Your alarm starts going off.
3
+    option: Get up
4
+        var: early = true
5
+        info: You get out of bed
6
+    endoption
7
+    option: Sleep through it
8
+    endoption
9
+end
10
+
11
+;checkSchedule;
12
+    text: <schedule>
13
+    option: back
14
+        goto: $var(back)
15
+    endoption
16
+end
17
+
18
+;1.1;
19
+    text: .
20
+    option: Look around
21
+        info: You're in your dorm
22
+        goto: ;1.1;
23
+    endoption
24
+    
25
+    option: Check schedule
26
+        var: back = ;1.1;
27
+        goto: ;checkSchedule;
28
+    endoption
29
+    
30
+    if: var(early = true)
31
+        option: Go to gym
32
+            goto: ;gym.early;
33
+        endoption
34
+    endif
35
+
36
+    if: var(early = false)
37
+        option: Go to gym
38
+            goto: ;gym.late;
39
+        endoption
40
+    endif
41
+end
42
+
43
+;gym.early;
44
+    text: You get to the gym. It's pretty early, and not many people are here yet
45
+    option: Go back to dorm
46
+        var: early = false
47
+        goto: ;1.1;
48
+    endoption
49
+end
50
+
51
+;gym.late;
52
+    text: You get to the gym. It's later in the day, and the gym is completely full
53
+    option: Go to free weights
54
+    option: Wait for a machine
55
+    option: 
56
+end

+ 2 - 1
webserver/html/playGame.html

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

+ 184 - 185
webserver/irc.txt

@@ -11,27 +11,27 @@
11 11
 ////           ////
12 12
 
13 13
 ;1;
14
-	text: You are on your computer. You have two IRC clients.
15
-		option: Start IceChat
14
+    text: You are on your computer. You have two IRC clients.
15
+        option: Start IceChat
16 16
                     info: Everyone makes fun of you and then your computer explodes.
17 17
                     info: -1 Computer
18 18
                     endgame: You learn IRC is a horrible place with many haters and never join again. You live a lonely life with no friends.
19 19
                 endoption
20
-		option: Start Hexchat
20
+        option: Start Hexchat
21 21
         endoption
22 22
 end
23 23
 
24 24
 ;1.2;
25 25
 
26
-	text: You join #powder.
27
-		option: Also join #powder-bots
26
+    text: You join #powder.
27
+        option: Also join #powder-bots
28 28
         endoption
29
-		option: Also join ##werewolf
29
+        option: Also join ##werewolf
30 30
         endoption
31
-		option: Join the conversation
32
-			rand: ;1.2.3;|;1.2.5;
31
+        option: Join the conversation
32
+            rand: ;1.2.3;|;1.2.5;
33 33
         endoption
34
-		option: Idle
34
+        option: Idle
35 35
         endoption
36 36
 end
37 37
 
@@ -39,50 +39,48 @@ end
39 39
 
40 40
 ;1.2.1;
41 41
 
42
-	text: Crackbot is in here.
43
-		option: ./use cow
42
+    text: Crackbot is in here.
43
+        option: ./use cow
44 44
                 info: Your cows stampede and many escape. You are squished and die.
45 45
                 endgame: You learn IRC is a horrible place with many haters and never join again. You live a lonely life with no friends.
46 46
         endoption
47
-		option: ./use potato
47
+        option: ./use potato
48 48
                 info: You plant the potato in the ground. The potato attacks you.
49 49
                 endgame: You learn IRC is a horrible place with many haters and never join again. You live a lonely life with no friends.
50
-        if: (item(SPAMBOT < 1)
51 50
             option: Bring in your own bot
52 51
                 item: SPAMBOT+1
53 52
             endoption
54
-        endif
55 53
         
56
-		option: Go back to #powder
57
-			goto: ;1.2;
58
-        endoption
54
+        option: Go back to #powder
55
+            goto: ;1.2;
56
+                endoption
59 57
 end
60 58
 
61 59
 ;1.2.1.3;
62 60
 
63
-	text: SPAMBOT joins ##powder-bots
64
-		option: !spam
61
+    text: SPAMBOT joins ##powder-bots
62
+        option: !spam
65 63
                 info: The bot starts spamming random obscenities. You get banned.
66 64
                 endgame: You learn IRC is a horrible place with many haters and never join again. You live a lonely life with no friends.
67 65
         endoption
68 66
         
69 67
         if: (item(Penguin < 1)
70 68
             option: !highlight
71
-                item: Penguin+1
69
+                item: penguin+1
72 70
             endoption
73 71
         endif
74 72
         
75
-		option: Go back to #powder
76
-			goto: ;1.1;
73
+        option: Go back to #powder
74
+            goto: ;1.2;
77 75
         endoption
78 76
 end
79 77
 
80 78
 
81 79
 ;1.2.1.3.2;
82 80
 
83
-	text: The bot highlights everyone in the channel. Everyone yells at you
84
-		option: Go back to ##powder-bots
85
-			goto: ;1.2.1;
81
+    text: The bot highlights everyone in the channel. Everyone yells at you
82
+        option: Go back to ##powder-bots
83
+            goto: ;1.2.1;
86 84
         endoption
87 85
 end
88 86
 
@@ -90,187 +88,187 @@ end
90 88
 
91 89
 ;1.2.2;
92 90
 
93
-	text: You join a game of werewolf. There are 5 players: Chelsie, ishanyx, no-n, woffle, and you. You are wolf. Everyone is silent.
94
-		option: kill Chelsie
91
+    text: You join a game of werewolf. There are 5 players: Chelsie, ishanyx, no-n, woffle, and you. You are wolf. Everyone is silent.
92
+        option: kill Chelsie
95 93
         endoption
96
-		option: kill ishanyx
94
+        option: kill ishanyx
97 95
         endoption
98
-		option: kill no-n
96
+        option: kill no-n
99 97
         endoption
100
-		option: kill woffle
98
+        option: kill woffle
101 99
         endoption
102 100
 end
103 101
 
104 102
 ;1.2.2.1;
105 103
 
106
-	text: The dead body of Chelsie, a villager, is found. Those remaining mourn the tragedy.
107
-		option: Claim seer
104
+    text: The dead body of Chelsie, a villager, is found. Those remaining mourn the tragedy.
105
+        option: Claim seer
108 106
         endoption
109
-		option: Claim seer-safe
107
+        option: Claim seer-safe
110 108
         endoption
111
-		option: Do nothing
109
+        option: Do nothing
112 110
         endoption
113 111
 end
114 112
 
115 113
 ;1.2.2.1.1;
116 114
 
117
-	text: ishanyx is the real seer and already told no-n he was safe. You are lynched.
118
-		option: You lose
119
-			goto: ;wolflynched;
115
+    text: ishanyx is the real seer and already told no-n he was safe. You are lynched.
116
+        option: You lose
117
+            goto: ;wolflynched;
120 118
         endoption
121 119
 end
122 120
 
123 121
 ;1.2.2.1.2;
124 122
 
125
-	text: ishanyx says she is the real seer and lynches you.
126
-		option: Lynch ishanyx back and hope for the best
127
-			rand: ;wolflynched;|;wolflynched;|;seerlynched;
123
+    text: ishanyx says she is the real seer and lynches you.
124
+        option: Lynch ishanyx back and hope for the best
125
+            rand: ;wolflynched;|;wolflynched;|;seerlynched;
128 126
         endoption
129 127
 end
130 128
 
131 129
 ;1.2.2.1.3;
132 130
 
133
-	text: ishanyx claims seer, with no-n being safe. She decies to lynch you.
134
-		option: You lose
135
-			goto: ;wolflynched;
131
+    text: ishanyx claims seer, with no-n being safe. She decies to lynch you.
132
+        option: You lose
133
+            goto: ;wolflynched;
136 134
         endoption
137 135
 end
138 136
 
139 137
 ;1.2.2.2;
140 138
 
141
-	text: The dead body of ishanyx, a seer, is found. Those remaining mourn the tragedy.
142
-		option: Claim seer safe and lynch no-n
143
-			rand: ;1.2.2.2.1;|;1.2.2.2.1;|;1.2.2.2.3;
139
+    text: The dead body of ishanyx, a seer, is found. Those remaining mourn the tragedy.
140
+        option: Claim seer safe and lynch no-n
141
+            rand: ;1.2.2.2.1;|;1.2.2.2.1;|;1.2.2.2.3;
144 142
         endoption
145
-		option: Do nothing
143
+        option: Do nothing
146 144
         endoption
147 145
 end
148 146
 
149 147
 ;1.2.2.2.1;
150 148
 
151
-	text: The villagers, after much debate, finally decide on lynching no-n, who turned out to be... a villager
152
-		option: kill Chelsie
153
-			item: potato+1
154
-			goto: ;winresults;
149
+    text: The villagers, after much debate, finally decide on lynching no-n, who turned out to be... a villager
150
+        option: kill Chelsie
151
+            item: potato+1
152
+            goto: ;winresults;
155 153
         endoption
156 154
 end
157 155
 
158 156
 ;1.2.2.2.2;
159 157
 
160
-	text: Nobody knows what to do so they just lynch you
161
-		option: You lose
162
-			goto: ;wolflynched;
158
+    text: Nobody knows what to do so they just lynch you
159
+        option: You lose
160
+            goto: ;wolflynched;
163 161
         endoption
164 162
 end
165 163
 
166 164
 ;1.2.2.2.3;
167 165
 
168
-	text: no-n says he is the real seer safe and you get lynched
169
-		option: You lose
170
-			goto: ;wolflynched;
166
+    text: no-n says he is the real seer safe and you get lynched
167
+        option: You lose
168
+            goto: ;wolflynched;
171 169
         endoption
172 170
 end
173 171
 
174 172
 ;1.2.2.3;
175 173
 
176
-	text: The dead body of no-n, a villager, is found. Those remaining mourn the tragedy.
177
-		option: Claim seer and lynch ishanyx
174
+    text: The dead body of no-n, a villager, is found. Those remaining mourn the tragedy.
175
+        option: Claim seer and lynch ishanyx
178 176
         endoption
179
-		option: Do nothing
180
-			rand: ;1.2.2.3.2;|;1.2.2.3.3;
177
+        option: Do nothing
178
+            rand: ;1.2.2.3.2;|;1.2.2.3.3;
181 179
         endoption
182 180
 end
183 181
 
184 182
 ;1.2.2.3.1;
185 183
 
186
-	text: ishanyx also claims seer, and you look slightly suspicious. The village decides to ...
187
-		option: continue
188
-			rand: ;wolflynched;|;wolflynched;|;seerlynched;
184
+    text: ishanyx also claims seer, and you look slightly suspicious. The village decides to ...
185
+        option: continue
186
+            rand: ;wolflynched;|;wolflynched;|;seerlynched;
189 187
         endoption
190 188
 end
191 189
 
192 190
 ;1.2.2.3.2;
193 191
 
194
-	text: ishanyx claims seer and decides to lynch woffle
195
-		option: lynch woffle
196
-			goto: ;wofflelynched;
192
+    text: ishanyx claims seer and decides to lynch woffle
193
+        option: lynch woffle
194
+            goto: ;wofflelynched;
197 195
         endoption
198 196
 end
199 197
 
200 198
 ;1.2.2.3.3;
201 199
 
202
-	text: ishanyx claims seer and decides to lynch you
203
-		option: You lose
204
-			goto: ;wolflynched;
200
+    text: ishanyx claims seer and decides to lynch you
201
+        option: You lose
202
+            goto: ;wolflynched;
205 203
         endoption
206 204
 end
207 205
 
208 206
 ;1.2.2.4;
209 207
 
210
-	text: ishanyx claims seer, and saw no-n as villager
211
-		option: Claim to be real seer and lynch ishanyx
208
+    text: ishanyx claims seer, and saw no-n as villager
209
+        option: Claim to be real seer and lynch ishanyx
212 210
         endoption
213
-		option: Do nothing
214
-			rand: ;1.2.2.4.2;|;1.2.2.4.3;
211
+        option: Do nothing
212
+            rand: ;1.2.2.4.2;|;1.2.2.4.3;
215 213
         endoption
216 214
 end
217 215
 
218 216
 ;1.2.2.4.1;
219 217
 
220
-	text: Total fail, nobody believes you and she just lynches you
221
-		option: You lose
222
-			goto: ;wolflynched;
218
+    text: Total fail, nobody believes you and she just lynches you
219
+        option: You lose
220
+            goto: ;wolflynched;
223 221
         endoption
224 222
 end
225 223
 
226 224
 ;1.2.2.4.2;
227 225
 
228
-	text: ishanyx decides to lynch woffle
229
-		option: Lynch woffle
230
-			goto: ;wofflelynched;
226
+    text: ishanyx decides to lynch woffle
227
+        option: Lynch woffle
228
+            goto: ;wofflelynched;
231 229
         endoption
232 230
 end
233 231
 
234 232
 ;1.2.2.4.3;
235 233
 
236
-	text: ishanyx decides to lynch you
237
-		option: You lose
238
-			goto: ;wolflynched;
234
+    text: ishanyx decides to lynch you
235
+        option: You lose
236
+            goto: ;wolflynched;
239 237
         endoption
240 238
 end
241 239
 
242 240
 ;wolflynched;
243 241
 
244
-	text: The villagers, after much debate, finally decide on lynching $(NAME), who turned out to be... a wolf
245
-		option: Continue
246
-				info: The wolf was $(NAME). The seer was ishanyx.
247
-	endgame: You learn IRC is a horrible place with many haters and never join again. You live a lonely life with no friends.
242
+    text: The villagers, after much debate, finally decide on lynching $(NAME), who turned out to be... a wolf
243
+        option: Continue
244
+                info: The wolf was $(NAME). The seer was ishanyx.
245
+    endgame: You learn IRC is a horrible place with many haters and never join again. You live a lonely life with no friends.
248 246
         endoption
249 247
 end
250 248
 
251 249
 ;seerlynched;
252 250
 
253
-	text: The villagers, after much debate, finally decide on lynching ishanyx, who turned out to be... a seer
254
-		option: kill woffle
255
-			item: potato+1
256
-			goto: ;winresults;
251
+    text: The villagers, after much debate, finally decide on lynching ishanyx, who turned out to be... a seer
252
+        option: kill woffle
253
+            item: potato+1
254
+            goto: ;winresults;
257 255
         endoption
258 256
 end
259 257
 
260 258
 ;wofflelynched;
261 259
 
262
-	text: The villagers, after much debate, finally decide on lynching woffle, who turned out to be... a villager
263
-		option: kill ishanyx
264
-			item: potato+1
265
-			goto: ;winresults;
260
+    text: The villagers, after much debate, finally decide on lynching woffle, who turned out to be... a villager
261
+        option: kill ishanyx
262
+            item: potato+1
263
+            goto: ;winresults;
266 264
         endoption
267 265
 end
268 266
 
269 267
 ;winresults;
270 268
 
271
-	text: The wolf was $(NAME). The seer was ishanyx.
272
-		option: You Win! You recieve a potato and go back to #powder
273
-			goto: ;1.2;
269
+    text: The wolf was $(NAME). The seer was ishanyx.
270
+        option: You Win! You recieve a potato and go back to #powder
271
+            goto: ;1.2;
274 272
         endoption
275 273
 end
276 274
 
@@ -278,206 +276,207 @@ end
278 276
 
279 277
 ;1.2.3;
280 278
 
281
-	text: Doxin posts a link to something on imgur.
282
-		option: Open link
279
+    text: Doxin posts a link to something on imgur.
280
+        option: Open link
283 281
         endoption
284
-		option: Ask Doxin what the link is
282
+        option: Ask Doxin what the link is
285 283
         endoption
286
-		option: Run far, far away
287
-                	info: You run far away from IRC, never to return again.
288
-	endgame: You learn IRC is a horrible place with many haters and never join again. You live a lonely life with no friends.
284
+        option: Run far, far away
285
+                    info: You run far away from IRC, never to return again.
286
+    endgame: You learn IRC is a horrible place with many haters and never join again. You live a lonely life with no friends.
289 287
         endoption
290 288
 end
291 289
 
292 290
 ;1.2.3.1;
293 291
 
294
-	text: It is a picture of a dildo. You are horrified.
295
-		option: Yell at Doxin for posting it
296
-                	info: You shame Doxin for posting such inappropriate pictures in #powder. After a large argument, Mortvert bans both of you.
297
-	endgame: You learn IRC is a horrible place with many haters and never join again. You live a lonely life with no friends.
292
+    text: It is a picture of a dildo. You are horrified.
293
+        option: Yell at Doxin for posting it
294
+                    info: You shame Doxin for posting such inappropriate pictures in #powder. After a large argument, Mortvert bans both of you.
295
+    endgame: You learn IRC is a horrible place with many haters and never join again. You live a lonely life with no friends.
298 296
         endoption
299
-		option: Pretend you never saw it
297
+        option: Pretend you never saw it
300 298
         endoption
301 299
 end
302 300
 
303 301
 ;1.2.3.1.2;
304 302
 
305
-	text: You erase this photo from your memory. Something makes you feel like you should have asked what it was ...
306
-		option: Continue
307
-			goto: ;1.2;
303
+    text: You erase this photo from your memory. Something makes you feel like you should have asked what it was ...
304
+        option: Continue
305
+            goto: ;1.2;
308 306
         endoption
309 307
 end
310 308
 
311 309
 ;1.2.3.2;
312 310
 
313
-	text: Doxin explains that it his his new Dildo. He accidentally ordered an extra though.
314
-		option: Compliment his dildo
315
-                	info: NSFW talk is against the rules, everyone flames you and then you get banned.
316
-	endgame: You learn IRC is a horrible place with many haters and never join again. You live a lonely life with no friends.
311
+    text: Doxin explains that it his his new Dildo. He accidentally ordered an extra though.
312
+        option: Compliment his dildo
313
+                    info: NSFW talk is against the rules, everyone flames you and then you get banned.
314
+    endgame: You learn IRC is a horrible place with many haters and never join again. You live a lonely life with no friends.
317 315
         endoption
318
-		option: Ask if you can have the extra
316
+        option: Ask if you can have the extra
319 317
         endoption
320
-		option: Pretend you aren't there
318
+        option: Pretend you aren't there
321 319
         endoption
322 320
 end
323 321
 
324 322
 ;1.2.3.2.2;
325 323
 
326
-	text: Doxin is happy to give you the extra, as long as you become his new boyfriend.
327
-	item: Dildo+1
328
-		option: Shudder and go back to #powder
329
-			goto: ;1.2;
324
+    text: Doxin is happy to give you the extra, as long as you become his new boyfriend.
325
+    item: Dildo+1
326
+        option: Shudder and go back to #powder
327
+            goto: ;1.2;
330 328
         endoption
331 329
 end
332 330
 
333 331
 ;1.2.3.2.3;
334 332
 
335
-	text: Doxin keeps highlighting you constantly, he knows you are really there.
336
-		option: Hide some more
333
+    text: Doxin keeps highlighting you constantly, he knows you are really there.
334
+        option: Hide some more
337 335
         endoption
338
-		option: Tell him to stop highlighting you
339
-                	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.
340
-	endgame: You learn IRC is a horrible place with many haters and never join again. You live a lonely life with no friends.
336
+        option: Tell him to stop highlighting you
337
+                    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.
338
+    endgame: You learn IRC is a horrible place with many haters and never join again. You live a lonely life with no friends.
341 339
         endoption
342 340
 end
343 341
 
344 342
 ;1.2.3.2.3.1;
345 343
 
346
-	text: He eventually stops and you can return to normal #powder conversation.
347
-		option: Continue
348
-			goto: ;1.2;
344
+    text: He eventually stops and you can return to normal #powder conversation.
345
+        option: Continue
346
+            goto: ;1.2;
349 347
         endoption
350 348
 end
351 349
 
352 350
 ;1.2.4;
353 351
 
354
-	text: You idle and wait for something to happen.
355
-		option: Keep idling
352
+    text: You idle and wait for something to happen.
353
+        option: Keep idling
356 354
         endoption
357
-		option: Check for activity
358
-			goto: ;1.2;
355
+        option: Check for activity
356
+            goto: ;1.2;
359 357
         endoption
360 358
 end
361 359
 
362 360
 ;1.2.4.1;
363 361
 
364
-	text: You idle and wait for something to happen.
365
-		option: Keep idling
362
+    text: You idle and wait for something to happen.
363
+        option: Keep idling
366 364
         endoption
367
-		option: Check for activity
368
-			goto: ;1.2;
365
+        option: Check for activity
366
+            goto: ;1.2;
369 367
         endoption
370 368
 end
371 369
 
372 370
 ;1.2.4.1.1;
373 371
 
374
-	text: You idle and wait for something to happen.
375
-		option: Keep idling
372
+    text: You idle and wait for something to happen.
373
+        option: Keep idling
376 374
         endoption
377
-		option: Check for activity
378
-			goto: ;1.2;
375
+        option: Check for activity
376
+            goto: ;1.2;
379 377
         endoption
380 378
 end
381 379
 
382 380
 ;1.2.4.1.1.1;
383 381
 
384
-	text: You idle and wait for something to happen.
385
-		option: Keep idling
386
-			item: Coin+1
382
+    text: You idle and wait for something to happen.
383
+        option: Keep idling
384
+            item: Coin+1
387 385
             endoption
388
-		option: Check for activity
389
-			goto: ;1.2;
386
+        option: Check for activity
387
+            goto: ;1.2;
390 388
             endoption
391 389
 end
392 390
 
393 391
 ;1.2.4.1.1.1.1;
394 392
 
395
-	text: You found a coin
396
-		option: Keep idling
397
-                	info: You idle so long that jacob1 bans you for never talking.
398
-	endgame: You learn IRC is a horrible place with many haters and never join again. You live a lonely life with no friends.
393
+    text: You found a coin
394
+        option: Keep idling
395
+                    info: You idle so long that jacob1 bans you for never talking.
396
+    endgame: You learn IRC is a horrible place with many haters and never join again. You live a lonely life with no friends.
399 397
 
400 398
         endoption
401
-		option: Check for activity
402
-			goto: ;1.2;
399
+        option: Check for activity
400
+            goto: ;1.2;
403 401
         endoption
404 402
 end
405 403
 
406 404
 ;1.2.5;
407 405
 
408
-	text: mniip wants somebody to run a lua script he made in tpt.
409
-		option: Tell him that you can do it
406
+    text: mniip wants somebody to run a lua script he made in tpt.
407
+        option: Tell him that you can do it
410 408
         endoption
411
-		option: Avoid running scripts from evil russian hackers
409
+        option: Avoid running scripts from evil russian hackers
410
+        info: You are very curious about what the script does, but go back to #powder anyway.
411
+                goto: ;1.2;
412 412
         endoption
413 413
 end
414 414
 
415 415
 ;1.2.5.1;
416 416
 
417
-	text: He gives you a link to the script.
418
-		option: Run script
419
-			info: -1 SESSION_ID
417
+    text: He gives you a link to the script.
418
+        option: Run script
419
+            info: -1 SESSION_ID
420 420
         endoption
421
-		option: Ask how to run the script
421
+        option: Ask how to run the script
422 422
         endoption
423
-		option: Ask what LUA is
424
-                	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.
425
-	info: -1 family$(ENDL)-1 house
426
-	endgame: You learn IRC is a horrible place with many haters and never join again. You live a lonely life with no friends.
423
+        option: Ask what LUA is
424
+                    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.
425
+    info: -1 family$(ENDL)-1 house
426
+    endgame: You learn IRC is a horrible place with many haters and never join again. You live a lonely life with no friends.
427 427
 
428 428
         endoption
429 429
 end
430 430
 
431 431
 ;1.2.5.1.1;
432 432
 
433
-	text: You run the script. TPT closes. You aren't sure why.
434
-		option: Continue back to #powder
435
-			goto: ;1.2;
433
+    text: You run the script. TPT closes. You aren't sure why.
434
+        option: Continue back to #powder
435
+            goto: ;1.2;
436 436
         endoption
437 437
 end
438 438
 
439 439
 ;1.2.5.1.2;
440 440
 
441
-	text: mniip tells you that you need Linux to run it.
442
-		option: Install Linux
443
-			item: Linux+1
441
+    text: mniip tells you that you need Linux to run it.
442
+        option: Install Linux
443
+            item: Linux+1
444 444
         endoption
445
-		option: Run it anyway
446
-			goto: ;1.2.5.1.1;
445
+        option: Run it anyway
446
+            goto: ;1.2.5.1.1;
447 447
         endoption
448
-		option: Buy a mac
449
-                	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.
450
-	info: -1 computer
448
+        option: Buy a mac
449
+                    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.
450
+    info: -1 computer
451 451
     info: -1 car
452 452
     info: -1 dignity
453 453
     info: -1 soul
454 454
     info: -1 house
455
-	endgame: You learn IRC is a horrible place with many haters and never join again. You live a lonely life with no friends.
455
+    endgame: You learn IRC is a horrible place with many haters and never join again. You live a lonely life with no friends.
456 456
 
457 457
         endoption
458 458
 end
459 459
 
460 460
 ;1.2.5.1.2.1;
461 461
 
462
-	text: You install Linux. Your computer is now more powerful than the fastest supercomputer
463
-		option: Return to #powder
464
-			goto: ;1.2;
462
+    text: You install Linux. Your computer is now more powerful than the fastest supercomputer
463
+        option: Return to #powder
464
+            goto: ;1.2;
465 465
         endoption
466
-		option: Redownload script
466
+        option: Redownload script
467 467
         endoption
468 468
 end
469 469
 
470 470
 ;1.2.5.1.2.1.2;
471 471
 
472
-	text: You download the script
473
-		option: Run script
474
-			goto: ;1.2.5.1.1;
472
+    text: You download the script
473
+        option: Run script
474
+            goto: ;1.2.5.1.1;
475 475
         endoption
476 476
 end
477 477
 
478 478
 
479 479
 ;1.2.5.2;
480 480
 
481
-	text: You are very curious about what the script does, but go back to #powder anyway.
482
-	goto: ;1.2;
481
+    
483 482
 end