Skip to content

Commit

Permalink
Merge branch 'development'
Browse files Browse the repository at this point in the history
  • Loading branch information
desplesda committed Feb 20, 2016
2 parents 7991b90 + 62b522d commit 755296e
Show file tree
Hide file tree
Showing 15 changed files with 403 additions and 72 deletions.
5 changes: 2 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@ language: csharp
solution: YarnSpinner.sln
install:
- nuget restore YarnSpinner.sln
- nuget install NUnit.Runners -Version 3.0.1 -OutputDirectory testrunner
script:
script:
- xbuild /p:Configuration=Release YarnSpinner.sln
- mono ./testrunner/NUnit.Console.3.0.1/tools/nunit3-console.exe ./YarnSpinnerTests/bin/Release/YarnSpinnerTests.dll
- mono ./YarnSpinnerTests/bin/Release/YarnSpinnerTests.exe
- ./run-tests.sh
42 changes: 0 additions & 42 deletions Tests/Ship.json

This file was deleted.

52 changes: 52 additions & 0 deletions Tests/Space.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
[
{
"title": "Sally",
"tags": "",
"body": "<<if visited(\"Sally\") is false>>\nPlayer: Hey, Sally.\nSally: Oh! Hi.\nSally: You snuck up on me.\nSally: Don't do that.\n<<else>>\nPlayer: Hey.\nSally: Hi.\n<<endif>>\n\n<<if not visited(\"Sally.Watch\")>>\n[[Anything exciting happen on your watch?|Sally.Watch]]\n<<endif>>\n<<if $received_warning_from_sally and not visited(\"Sally.Sorry\")>>\n[[Sorry about the console.|Sally.Sorry]]\n<<endif>>\n[[See you later.|Sally.Exit]]",
"position": {
"x": 371,
"y": 137
},
"colorID": 0
},
{
"title": "Sally.Watch",
"tags": "",
"body": "Sally: Not really. \nSally: Same old nebula, doing the same old thing.\nSally: Oh, Ship wanted to see you. Go say hi to it.\n<<set $should_see_ship to true>>\n<<if visited(\"Ship\") is true>>\nPlayer: Already done!\nSally: Go say hi again.\n<<endif>>",
"position": {
"x": 359,
"y": 456
},
"colorID": 0
},
{
"title": "Sally.Exit",
"tags": "",
"body": "Sally: Bye.",
"position": {
"x": 58,
"y": 443
},
"colorID": 6
},
{
"title": "Ship",
"tags": "",
"body": "<<if visited(\"Ship\") is false>>\n Ship: Hey, friend.\n Player: Hi, Ship.\n Player: How's space?\n Ship: Oh, man.\n <<setsprite ShipFace happy>>\n Ship: It's HUGE!\n <<setsprite ShipFace neutral>>\n<<else>>\n <<setsprite ShipFace happy>>\n Ship: Hey!!\n <<setsprite ShipFace neutral>>\n<<endif>>\n\n<<if $should_see_ship is true and $received_warning_from_sally is false>>\nPlayer: Sally said you wanted to see me?\n<<setsprite ShipFace happy>>\nShip: She totally did!!\n<<setsprite ShipFace neutral>>\nShip: She wanted me to tell you...\nShip: If you ever go off-watch without resetting the console again...\n<<setsprite ShipFace happy>>\nShip: She'll flay you alive!\n<<set $received_warning_from_sally to true>>\nPlayer: Uh.\n<<setsprite ShipFace neutral>>\n\n<<endif>>\n",
"position": {
"x": 721,
"y": 130
},
"colorID": 0
},
{
"title": "Sally.Sorry",
"tags": "",
"body": "Sally: Yeah. Don't do it again.",
"position": {
"x": 674,
"y": 465
},
"colorID": 0
}
]
2 changes: 2 additions & 0 deletions Tests/TestCases/SingleLine.node
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
// Tests a single line

<<expect_line("This is a single line of dialogue.")>>

This is a single line of dialogue.

<<assert(true)>>
79 changes: 79 additions & 0 deletions Tests/TestCases/Smileys.node
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
// Testing smileys

Mae: ¯\_(ツ)_/¯
Mae: <o>
Mae: :|
Mae: :)
Mae: :(
Mae: :o
Mae: :\
Mae: :<
Mae: D:
Mae: -_-
Mae: =_=
Mae: U_U
Mae: O_O
Mae: o_o
Mae: \o/
Mae: /o\
Mae: o/
Mae: _o_
Mae: o>
Mae: / \
Mae: \ /
Mae: ~~

// Testing in an option group


<<prepare_for_options(-1, 0)>>

-> Mae: ¯\_(ツ)_/¯
-> Mae: <o>
-> Mae: :|
-> Mae: :)
-> Mae: :(
-> Mae: :o
-> Mae: :\
-> Mae: :<
-> Mae: D:
-> Mae: -_-
-> Mae: =_=
-> Mae: U_U
-> Mae: O_O
-> Mae: o_o
-> Mae: \o/
-> Mae: /o\
-> Mae: o/
-> Mae: _o_
-> Mae: o>
-> Mae: / \
-> Mae: \ /
-> Mae: ~~

// Testing in an option group, with conditionals

<<prepare_for_options(-1, 0)>>

-> Mae: ¯\_(ツ)_/¯ <<if true>>
-> Mae: <o> <<if true>>
-> Mae: :| <<if true>>
-> Mae: :) <<if true>>
-> Mae: :( <<if true>>
-> Mae: :o <<if true>>
-> Mae: :\ <<if true>>
-> Mae: :< <<if true>>
-> Mae: D: <<if true>>
-> Mae: -_- <<if true>>
-> Mae: =_= <<if true>>
-> Mae: U_U <<if true>>
-> Mae: O_O <<if true>>
-> Mae: o_o <<if true>>
-> Mae: \o/ <<if true>>
-> Mae: /o\ <<if true>>
-> Mae: o/ <<if true>>
-> Mae: _o_ <<if true>>
-> Mae: o> <<if true>>
-> Mae: / \ <<if true>>
-> Mae: \ / <<if true>>
-> Mae: ~~ <<if true>>
12 changes: 6 additions & 6 deletions YarnSpinner.sln
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@


Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 2010
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "YarnSpinnerConsole", "YarnSpinnerConsole\YarnSpinnerConsole.csproj", "{858816BE-870C-40A8-BC22-8EDA51E2F339}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "YarnSpinnerConsole", "YarnSpinnerConsole\YarnSpinnerConsole.csproj", "{20B32C04-790E-4A50-BF32-20EA5C3CB0E2}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{7A162B42-C144-4C15-9ABC-BE5898622C32}"
EndProject
Expand All @@ -15,6 +15,10 @@ Global
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{20B32C04-790E-4A50-BF32-20EA5C3CB0E2}.Debug|x86.ActiveCfg = Debug|x86
{20B32C04-790E-4A50-BF32-20EA5C3CB0E2}.Debug|x86.Build.0 = Debug|x86
{20B32C04-790E-4A50-BF32-20EA5C3CB0E2}.Release|x86.ActiveCfg = Release|x86
{20B32C04-790E-4A50-BF32-20EA5C3CB0E2}.Release|x86.Build.0 = Release|x86
{24F90A1D-B1CA-4E0F-8BD2-A91D8B443855}.Debug|x86.ActiveCfg = Debug|Any CPU
{24F90A1D-B1CA-4E0F-8BD2-A91D8B443855}.Debug|x86.Build.0 = Debug|Any CPU
{24F90A1D-B1CA-4E0F-8BD2-A91D8B443855}.Release|x86.ActiveCfg = Release|Any CPU
Expand All @@ -23,10 +27,6 @@ Global
{6C3B03D2-2E89-4EC3-A022-E84053A7B17F}.Debug|x86.Build.0 = Debug|Any CPU
{6C3B03D2-2E89-4EC3-A022-E84053A7B17F}.Release|x86.ActiveCfg = Release|Any CPU
{6C3B03D2-2E89-4EC3-A022-E84053A7B17F}.Release|x86.Build.0 = Release|Any CPU
{858816BE-870C-40A8-BC22-8EDA51E2F339}.Debug|x86.ActiveCfg = Debug|x86
{858816BE-870C-40A8-BC22-8EDA51E2F339}.Debug|x86.Build.0 = Debug|x86
{858816BE-870C-40A8-BC22-8EDA51E2F339}.Release|x86.ActiveCfg = Release|x86
{858816BE-870C-40A8-BC22-8EDA51E2F339}.Release|x86.Build.0 = Release|x86
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
EndGlobalSection
Expand Down
Loading

0 comments on commit 755296e

Please # to comment.