Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[*.cs]
csharp_new_line_before_open_brace = none
csharp_new_line_before_else = false
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
/[Bb]uild/
/[Bb]uilds/
/Logs
/UserSettings
/Assets/AssetStoreTools*

/Assets/Nonredist*
Expand Down
1 change: 1 addition & 0 deletions Assets/Resources/BillingMode.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"androidStore":"GooglePlay"}
7 changes: 7 additions & 0 deletions Assets/Resources/BillingMode.json.meta

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

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

Binary file added Assets/Resources/Fonts/cyberdyne.ttf
Binary file not shown.
22 changes: 22 additions & 0 deletions Assets/Resources/Fonts/cyberdyne.ttf.meta

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

1 change: 0 additions & 1 deletion Assets/Resources/Images/UI/card-draw.svg.meta

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

1 change: 0 additions & 1 deletion Assets/Resources/Images/UI/click.svg.meta

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

1 change: 0 additions & 1 deletion Assets/Resources/Images/UI/credit.svg.meta

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

1 change: 0 additions & 1 deletion Assets/Resources/Images/UI/hourglass.svg.meta

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

1 change: 0 additions & 1 deletion Assets/Resources/Images/UI/server-rack.svg.meta

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

15 changes: 12 additions & 3 deletions Assets/Resources/Images/UI/symbols.png.meta

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

123 changes: 117 additions & 6 deletions Assets/Scenes/Runner Game.unity
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ MonoBehaviour:
m_outlineColor:
serializedVersion: 2
rgba: 4278190080
m_fontSize: 72
m_fontSize: 50.35
m_fontSizeBase: 36
m_fontWeight: 400
m_enableAutoSizing: 1
Expand Down Expand Up @@ -1236,8 +1236,9 @@ RectTransform:
- {fileID: 392453616}
- {fileID: 364526017}
- {fileID: 1730285211}
- {fileID: 1600730671}
m_Father: {fileID: 0}
m_RootOrder: 1
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
Expand Down Expand Up @@ -1385,8 +1386,83 @@ Transform:
m_Children:
- {fileID: 115784155}
m_Father: {fileID: 0}
m_RootOrder: 3
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &798008800
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 798008803}
- component: {fileID: 798008802}
- component: {fileID: 798008801}
m_Layer: 5
m_Name: Credit(Clone)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &798008801
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 798008800}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 3286163911610860551, guid: 14ded5a7c71921141b0312119ba4dce2,
type: 3}
m_Type: 0
m_PreserveAspect: 1
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!222 &798008802
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 798008800}
m_CullTransparentMesh: 1
--- !u!224 &798008803
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 798008800}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -16, y: 42.666668}
m_SizeDelta: {x: 32, y: 64}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &836102266
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -1755,7 +1831,7 @@ MonoBehaviour:
m_outlineColor:
serializedVersion: 2
rgba: 4278190080
m_fontSize: 72
m_fontSize: 50.35
m_fontSizeBase: 36
m_fontWeight: 400
m_enableAutoSizing: 1
Expand Down Expand Up @@ -2505,6 +2581,41 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &1600730670
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1600730671}
m_Layer: 5
m_Name: Game bracket
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1600730671
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1600730670}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 711624506}
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.25}
m_AnchorMax: {x: 1, y: 0.75}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &1622406199
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -2634,7 +2745,7 @@ MonoBehaviour:
m_outlineColor:
serializedVersion: 2
rgba: 4278190080
m_fontSize: 72
m_fontSize: 50.35
m_fontSizeBase: 36
m_fontWeight: 400
m_enableAutoSizing: 1
Expand Down Expand Up @@ -2736,7 +2847,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 2
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1685858174
MonoBehaviour:
Expand Down
3 changes: 1 addition & 2 deletions Assets/Scripts/AsyncAction.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
using System.Threading.Tasks;

public delegate Task AsyncAction();
public delegate Task AsyncAction<in T1>(T1 arg1);
public delegate Task AsyncAction<in T1, in T2>(T1 arg1, T2 arg2);


5 changes: 4 additions & 1 deletion Assets/Scripts/Config/GameConfig.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@
using UnityEngine;
using view;
using view.gui;
using view.gui.brackets;
using view.log;
using static view.gui.GameObjectExtensions;

public class GameConfig : MonoBehaviour
{
Expand All @@ -14,7 +16,7 @@ public class GameConfig : MonoBehaviour

void Start()
{
var board = GameObject.Find("/Board");
var board = FindOrFail("/Board");
gameMenu = board.GetComponentInChildren<GameMenu>();
gameMenu.Resume();
var perception = new RunnerPerception();
Expand Down Expand Up @@ -44,6 +46,7 @@ void Start()
flowLog.Display(game);
var corpView = new CorpViewConfig().Display(game, parts);
new RunnerViewConfig().Display(game.runner, flowView, corpView, parts);
new RunnerGameBracket(FindOrFail("Game bracket"), game);
game.Start(corpDeck, runnerDeck);
}

Expand Down
2 changes: 1 addition & 1 deletion Assets/Scripts/Controller/InteractiveDiscard.cs
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public InteractiveDiscard(Card card, DropZone activation, Runner runner)

async Task IInteractive.Interact()
{
grip.Discard(card, heap);
await grip.Discard(card, heap);
await Task.CompletedTask;
}

Expand Down
10 changes: 5 additions & 5 deletions Assets/Scripts/Model/AI/CorpAi.cs
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public class CorpAi :
private Task Thinking() => Task.Delay(1700);
private IList<Ability> actions = new List<Ability>();
private IList<Ability> legalActions = new List<Ability>();
private IList<CardAbility> paidAbilities = new List<CardAbility>();
private IList<Ability> paidAbilities = new List<Ability>();
private Random random;

public CorpAi(Random random)
Expand All @@ -45,10 +45,10 @@ void IPilot.Play(Game game)
zones.hq.DiscardingOne += DiscardOne;
}

async Task<IEffect> IPilot.TriggerFromSimultaneous(IList<IEffect> effects)
async Task<Ability> IPilot.TriggerFromSimultaneous(IEnumerable<Ability> abilities)
{
await Thinking();
return effects.First();
return abilities.First();
}

private async Task TakeAction(ITurn turn)
Expand All @@ -59,9 +59,9 @@ private async Task TakeAction(ITurn turn)
await randomLegalAction.Trigger();
}

private void DiscardOne()
private async Task DiscardOne()
{
zones.hq.Discard(zones.hq.Random(), zones.archives);
await zones.hq.Discard(zones.hq.Random(), zones.archives);
}

async private Task RezSomething(RezWindow window, List<Ability> rezzables)
Expand Down
8 changes: 8 additions & 0 deletions Assets/Scripts/Model/Abilities.meta

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

Loading