Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/EnigmaDragons/LDJam46
Browse files Browse the repository at this point in the history
  • Loading branch information
SilasReinagel committed Apr 20, 2020
2 parents 6c9a442 + a02be81 commit d699e7f
Show file tree
Hide file tree
Showing 57 changed files with 4,198 additions and 857 deletions.
Binary file added art/soundtrack.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
22 changes: 22 additions & 0 deletions src/LDJam46/Assets/Audio/Sounds/WORLD TRANSITION NEW.wav.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions src/LDJam46/Assets/Content/Comforts/Book.asset
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 60b45686d16714a44ac3595e1070a624, type: 3}
m_Name: Book
m_EditorClassIdentifier:
DefaultPercentage: 0.4
DefaultPercentage: 0.5
ComfortLevels:
- Percentage: 0.5
Demon: 1
- Percentage: 0.75
Demon: 2
JournalEntry: 8
Penalties: []
6 changes: 3 additions & 3 deletions src/LDJam46/Assets/Content/Comforts/Coffee.asset
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 60b45686d16714a44ac3595e1070a624, type: 3}
m_Name: Coffee
m_EditorClassIdentifier:
DefaultPercentage: 0.25
DefaultPercentage: 0
ComfortLevels:
- Percentage: 0.35
- Percentage: 0.25
Demon: 0
JournalEntry: 5
Penalties:
- Demon: 1
Penalty: 0.6
Penalty: 0.5
8 changes: 4 additions & 4 deletions src/LDJam46/Assets/Content/Comforts/MotivationalPoster.asset
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 60b45686d16714a44ac3595e1070a624, type: 3}
m_Name: MotivationalPoster
m_EditorClassIdentifier:
DefaultPercentage: 0.3
DefaultPercentage: 0
ComfortLevels:
- Percentage: 0.4
- Percentage: 0.25
Demon: 0
- Percentage: 0.25
Demon: 0
- Percentage: 0.4
Demon: 2
JournalEntry: 6
Penalties: []
10 changes: 6 additions & 4 deletions src/LDJam46/Assets/Content/Comforts/Music.asset
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,13 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 60b45686d16714a44ac3595e1070a624, type: 3}
m_Name: Music
m_EditorClassIdentifier:
DefaultPercentage: 0.25
DefaultPercentage: 0
ComfortLevels:
- Percentage: 0.4
Demon: 2
- Percentage: 0.5
Demon: 0
- Percentage: 0.25
Demon: 1
JournalEntry: 7
Penalties:
- Demon: 1
Penalty: 0.1
Penalty: 0.25
8 changes: 6 additions & 2 deletions src/LDJam46/Assets/Content/Comforts/Pills.asset
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,12 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 60b45686d16714a44ac3595e1070a624, type: 3}
m_Name: Pills
m_EditorClassIdentifier:
DefaultPercentage: 0.8
ComfortLevels: []
DefaultPercentage: 0
ComfortLevels:
- Percentage: 0.75
Demon: 0
- Percentage: 0.75
Demon: 1
JournalEntry: 4
Penalties:
- Demon: 2
Expand Down
16 changes: 10 additions & 6 deletions src/LDJam46/Assets/Content/Items/Glasses.asset
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,18 @@ MonoBehaviour:
Name: Glasses
ComfortBonuses:
- Comfort: {fileID: 11400000, guid: 7ac4817c3fa19444cb4c59060a92cbd8, type: 2}
DefaultPercentage: 0.6
DefaultPercentage: 0
PerDemon:
- Percentage: 0.8
- Percentage: 0.5
Demon: 0
- Percentage: 0.8
Demon: 2
- Percentage: 0.5
Demon: 1
- Comfort: {fileID: 11400000, guid: 607c1418bf2d68b48bf7fcbb94d00ba0, type: 2}
DefaultPercentage: 0.8
DefaultPercentage: 0
PerDemon:
- Percentage: 1
- Percentage: 0.75
Demon: 0
- Percentage: 0.75
Demon: 1
- Percentage: 1
Demon: 2
8 changes: 5 additions & 3 deletions src/LDJam46/Assets/Content/Items/Headphones.asset
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@ MonoBehaviour:
Name: Earphones
ComfortBonuses:
- Comfort: {fileID: 11400000, guid: 44907c3d90ec1c9458983de91e20b505, type: 2}
DefaultPercentage: 0.5
DefaultPercentage: 0
PerDemon:
- Percentage: 0.8
Demon: 2
- Percentage: 0.75
Demon: 0
- Percentage: 0.5
Demon: 1
4 changes: 2 additions & 2 deletions src/LDJam46/Assets/Content/Items/Sugar.asset
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ MonoBehaviour:
Name: Sugar
ComfortBonuses:
- Comfort: {fileID: 11400000, guid: 4eed662bdbdab53459c136d4d145442f, type: 2}
DefaultPercentage: 0.5
DefaultPercentage: 0
PerDemon:
- Percentage: 0.65
- Percentage: 0.5
Demon: 0
8 changes: 6 additions & 2 deletions src/LDJam46/Assets/Content/Items/Water.asset
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,9 @@ MonoBehaviour:
Name: Pills
ComfortBonuses:
- Comfort: {fileID: 11400000, guid: fa0b7c7f0caf7cf4da8fa1aaa88afa10, type: 2}
DefaultPercentage: 1
PerDemon: []
DefaultPercentage: 0
PerDemon:
- Percentage: 1
Demon: 0
- Percentage: 1
Demon: 1
21 changes: 21 additions & 0 deletions src/LDJam46/Assets/Dialogues/1-2.asset
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: c5c7a4a9e5e821e4d8c01ebf9cb5f11c, type: 3}
m_Name: 1-2
m_EditorClassIdentifier:
Lines:
- Type: 4
Text:
SoundEffect: {fileID: 0}
Effect: 0
TriggerName:
Image: {fileID: 0}
8 changes: 8 additions & 0 deletions src/LDJam46/Assets/Dialogues/1-2.asset.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 21 additions & 0 deletions src/LDJam46/Assets/Dialogues/1-3.asset
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: c5c7a4a9e5e821e4d8c01ebf9cb5f11c, type: 3}
m_Name: 1-3
m_EditorClassIdentifier:
Lines:
- Type: 4
Text:
SoundEffect: {fileID: 0}
Effect: 0
TriggerName:
Image: {fileID: 0}
8 changes: 8 additions & 0 deletions src/LDJam46/Assets/Dialogues/1-3.asset.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 21 additions & 0 deletions src/LDJam46/Assets/Dialogues/2-1.asset
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: c5c7a4a9e5e821e4d8c01ebf9cb5f11c, type: 3}
m_Name: 2-1
m_EditorClassIdentifier:
Lines:
- Type: 4
Text:
SoundEffect: {fileID: 0}
Effect: 0
TriggerName:
Image: {fileID: 0}
8 changes: 8 additions & 0 deletions src/LDJam46/Assets/Dialogues/2-1.asset.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 21 additions & 0 deletions src/LDJam46/Assets/Dialogues/2-2.asset
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: c5c7a4a9e5e821e4d8c01ebf9cb5f11c, type: 3}
m_Name: 2-2
m_EditorClassIdentifier:
Lines:
- Type: 4
Text:
SoundEffect: {fileID: 0}
Effect: 0
TriggerName:
Image: {fileID: 0}
8 changes: 8 additions & 0 deletions src/LDJam46/Assets/Dialogues/2-2.asset.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 21 additions & 0 deletions src/LDJam46/Assets/Dialogues/2-3.asset
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: c5c7a4a9e5e821e4d8c01ebf9cb5f11c, type: 3}
m_Name: 2-3
m_EditorClassIdentifier:
Lines:
- Type: 4
Text:
SoundEffect: {fileID: 0}
Effect: 0
TriggerName:
Image: {fileID: 0}
8 changes: 8 additions & 0 deletions src/LDJam46/Assets/Dialogues/2-3.asset.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 21 additions & 0 deletions src/LDJam46/Assets/Dialogues/3-1.asset
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: c5c7a4a9e5e821e4d8c01ebf9cb5f11c, type: 3}
m_Name: 3-1
m_EditorClassIdentifier:
Lines:
- Type: 4
Text:
SoundEffect: {fileID: 0}
Effect: 0
TriggerName:
Image: {fileID: 0}
8 changes: 8 additions & 0 deletions src/LDJam46/Assets/Dialogues/3-1.asset.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 21 additions & 0 deletions src/LDJam46/Assets/Dialogues/3-2.asset
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: c5c7a4a9e5e821e4d8c01ebf9cb5f11c, type: 3}
m_Name: 3-2
m_EditorClassIdentifier:
Lines:
- Type: 4
Text:
SoundEffect: {fileID: 0}
Effect: 0
TriggerName:
Image: {fileID: 0}
8 changes: 8 additions & 0 deletions src/LDJam46/Assets/Dialogues/3-2.asset.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 21 additions & 0 deletions src/LDJam46/Assets/Dialogues/3-3.asset
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: c5c7a4a9e5e821e4d8c01ebf9cb5f11c, type: 3}
m_Name: 3-3
m_EditorClassIdentifier:
Lines:
- Type: 4
Text:
SoundEffect: {fileID: 0}
Effect: 0
TriggerName:
Image: {fileID: 0}
Loading

0 comments on commit d699e7f

Please sign in to comment.