Skip to content

Commit

Permalink
Before bugfix attempts...
Browse files Browse the repository at this point in the history
  • Loading branch information
thquinn committed Dec 3, 2018
1 parent dd2df7e commit 1dc1dfb
Show file tree
Hide file tree
Showing 863 changed files with 2,999 additions and 409 deletions.
Binary file modified .vs/Exchange/v15/.suo
Binary file not shown.
Binary file modified .vs/Exchange/v15/Server/sqlite3/storage.ide
Binary file not shown.
Binary file modified .vs/Exchange/v15/Server/sqlite3/storage.ide-shm
Binary file not shown.
Binary file modified .vs/Exchange/v15/Server/sqlite3/storage.ide-wal
Binary file not shown.
1 change: 1 addition & 0 deletions Assembly-CSharp.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@
<Compile Include="Assets\Scripting\Reveal.cs" />
<Compile Include="Assets\Scripting\Sacrifice.cs" />
<Compile Include="Assets\Scripting\Score.cs" />
<Compile Include="Assets\Scripting\TBC.cs" />
<Compile Include="Assets\Scripting\Text.cs" />
<Compile Include="Assets\Scripting\Time.cs" />
<Compile Include="Assets\StoryControllerScript.cs" />
Expand Down
6 changes: 3 additions & 3 deletions Assets/AudioScript.cs
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ void Start () {
sources.Add(SFX.Set, source_set);
}
public void Play(SFX sfx) {
if (sfx == SFX.Get) {
source_get.pitch = Random.Range(1.25f, 1.75f);
}
//if (sfx == SFX.Get) {
// source_get.pitch = Random.Range(1.45f, 1.55f);
//}
sources[sfx].PlayOneShot(sources[sfx].clip);
}

Expand Down
9 changes: 9 additions & 0 deletions Assets/CardControllerScript.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ public class CardControllerScript : MonoBehaviour {
public StoryControllerScript storyScript;
public AltarScript altarScript;
public AudioScript audioScript;
public TextMeshProUGUI descriptionLabel;

public GameObject cardPrefab;
public Texture[] textures;
Expand All @@ -20,6 +21,8 @@ public class CardControllerScript : MonoBehaviour {
float heldDX = 0, heldDY = 0;

void Start() {
descriptionLabel.alpha = 0;

cardImages = new Dictionary<string, Texture>();
foreach (Texture texture in textures) {
cardImages.Add(texture.name, texture);
Expand Down Expand Up @@ -153,6 +156,12 @@ void Update () {
}
held.transform.position = Vector3.Lerp(held.transform.position, heldPosition, .4f);
held.transform.rotation = Quaternion.Lerp(held.transform.rotation, heldAngle, .4f);

// Manage description label.
descriptionLabel.alpha = Mathf.Min(1, descriptionLabel.alpha + .04f);
descriptionLabel.text = storyScript.items[held.name];
} else {
descriptionLabel.alpha = 0;
}
}

Expand Down
2 changes: 1 addition & 1 deletion Assets/GradientMaterial.mat
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ Material:
- _UVSec: 0
- _ZWrite: 0
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1e-45}
- _Color: {r: 1, g: 1, b: 1, a: 0.2929826}
- _EmissionColor: {r: 1, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}
- _TintColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5}
10 changes: 7 additions & 3 deletions Assets/Resources/Pages/antestas.txt
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
time: 18 afternoon
text: A week passes without event. You hardly leave your cottage, too wary to explore Vandine but for a few twilight forays when you hope not to be seen. No one comes pounding down your door for help.
text: Eventually, though, you tire of dried and preserved food, of washing it down with well water. You make yourself as presentable as you can without a mirror, pack up your things, and head out.
text: Eventually, you tire of dried and preserved food, of washing it down with well water. You make yourself as presentable as you can without a mirror, pack up your things, and head out.
text: A few dozen people mill about the town center. A tavern functions as the entire "commercial district," along with two shoddy wooden stalls manned by locals. People notice you as you pass, let you notice them noticing you. Some smiles, some sneers. A lot of missing teeth.
text: A man slouching against the tavern spots you and makes a beeline for you.
text: "Hey, you!" He shouts, breaking the afternoon quiet and turning heads.\n"How, uh... how can I help?" You say.\n"You're from the Arcanum." It isn't a question.\n"That's right."\n"You're the Exchanger." A crowd starts to gather, or what makes for a crowd in a hundred-person town.
text: "Show us something, eh?"\n"Leave it be, Antestas," a young woman says.\n"'Leave it be'? We got a real-life Exchanger in town, hiding out in that fancy new cottage for a week! Let's see some magic!"
text: "Show us something, eh?"\n"Leave it be, Antestas," a woman interjects.\n"'Leave it be'? We got a real-life Exchanger in town, hiding out in that fancy new cottage for a week! Let's see some magic!"
text: "It's fine," you address the crowd. A mother pulls her young daughter away from the crowd. "Is anyone sick? Anyone have something broken that needs fixing?"\n"No," says Antestas, "I ain't talking about that hedge-wizard shit. I wanna see some dang Magic, capital M!"\nThe crowd murmurs, a mixed reaction, but most stare at you expectantly.
text: You roll up your sleeves.

Expand Down Expand Up @@ -49,4 +49,8 @@ sacrifice: orb
text: A look of panic crosses his face. "Uhh... I guess I must have read about it somewhere." Before you can respond, he runs off. The rest of the crowd regards you, impressed, until the snow sublimates and they go about their days.

sacrifice: skein

text: Something happens.
lose: skein
text: Something else happens.

tbc
4 changes: 2 additions & 2 deletions Assets/Resources/Pages/journey.txt
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ text: She invites herself in. "I admit that I don't really know what it is you d
text: You put on your best officious tone. "As your resident Exchanger, I am here to help in any way I can. If anyone in town has a problem, tell them to seek me out and I will do my best to—" You stammer as Zasha pushes something into your hands.
get: skein
text: "I figure you'll have plenty of free time," she says, "so here's something to keep you occupied. Product of Cademo's prize sheep!" You quietly thank her.
text: "Now I gotta go, but there's something you should know." A puzzled look crosses her face. "Now, everyone's been waitin' for you to show up, and I bet you'll have folks pounding down your door for help with this and that..."\n"What?" You ask.\n"But... some others aren't quite so happy you're here."
text: "I see."\n"Maybe they're superstitious, or maybe they just ain't used to visitors, but I'm sure they'll warm up to you once they meet you."
text: "Now I gotta go, but there's something you should know." A puzzled look crosses her face. "Now, everyone's been waitin' for you to show up, and I bet you'll have folks pounding down your door for help with this and that, but..."\n"What?" You ask.\n"...some others aren't quite so happy you're here."
text: "I see."\n"Maybe they're superstitious, or maybe they just ain't used to visitors, but I'm sure they'll warm up to you once they get to know you. You seem... likeable!"\n"Thanks."
text: You've never heard of anything like this before. Your older friends, back from their rural residencies, have regaled you with stories of kind, honest bumpkins dazzled by arcane displays. Magic is rare, sure, but it's in most parts of the world it's hardly an unknown quantity.
text: You really are in the middle of nowhere.
text: You and Zasha chat for a couple more minutes, then she's off to continue her day. You close the door and sit on your bed, feeling idle.
Expand Down
2 changes: 1 addition & 1 deletion Assets/Resources/Pages/start.txt
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,6 @@ sacrifice: orb

text: "I've spoken to the driver," your mentor says, pulling a folded scrap of paper from his breast pocket. "He should have you in Vandine by the evening of the third. Population: one hundred and seventeen, primary industry"—he casts you a pitying glance—"agriculture. You will spend exactly one year there, upon completion of which you will become an Exchanger-at-Large." His enunciation of those last three words is perfectly precise. You rack your brain for something sentimental to say and come up empty.
text: "Rural residency is a proud arcane tradition, one as old as this very profession. You may think it beneath you — I know I did when I was your age — but this life of honest work will teach you things that mere tutelage cannot."
text: "I've... been hard on you." You avert your gaze, surprised to find yourself on the verge of tears as he continues. "It's because you are destined for great things. Try not to forget that while you mend plows and farmstead marriages. I anticipate your return."
text: He pauses. "I've... been hard on you." You avert your gaze, surprised to find yourself on the verge of tears as he continues. "It's because you are destined for great things. Try not to forget that while you mend plows and farmstead marriages. I anticipate your return."
text: You try one last time to put words to your feelings, and again fail. You never had an adequate teacher in these matters. And then he's walking away, leaving you standing beside your wagon.
go: journey
Loading

0 comments on commit 1dc1dfb

Please sign in to comment.