Skip to content
This repository was archived by the owner on Oct 14, 2022. It is now read-only.

Commit 9f27d1b

Browse files
author
javierfoe
committed
Jose Delgado character added
1 parent f08ab0a commit 9f27d1b

File tree

12 files changed

+381
-253
lines changed

12 files changed

+381
-253
lines changed

‎Assets/Prefabs/Character/Jose Delgado.prefab

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!1 &490826125789148606
4+
GameObject:
5+
m_ObjectHideFlags: 0
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
serializedVersion: 6
10+
m_Component:
11+
- component: {fileID: 490826125789148545}
12+
- component: {fileID: 490826125789148544}
13+
- component: {fileID: 490826125789148607}
14+
m_Layer: 0
15+
m_Name: Jose Delgado
16+
m_TagString: Untagged
17+
m_Icon: {fileID: 0}
18+
m_NavMeshLayer: 0
19+
m_StaticEditorFlags: 0
20+
m_IsActive: 1
21+
--- !u!4 &490826125789148545
22+
Transform:
23+
m_ObjectHideFlags: 0
24+
m_CorrespondingSourceObject: {fileID: 0}
25+
m_PrefabInstance: {fileID: 0}
26+
m_PrefabAsset: {fileID: 0}
27+
m_GameObject: {fileID: 490826125789148606}
28+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
29+
m_LocalPosition: {x: 0, y: 0, z: 0}
30+
m_LocalScale: {x: 1, y: 1, z: 1}
31+
m_Children: []
32+
m_Father: {fileID: 0}
33+
m_RootOrder: 0
34+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
35+
--- !u!114 &490826125789148544
36+
MonoBehaviour:
37+
m_ObjectHideFlags: 0
38+
m_CorrespondingSourceObject: {fileID: 0}
39+
m_PrefabInstance: {fileID: 0}
40+
m_PrefabAsset: {fileID: 0}
41+
m_GameObject: {fileID: 490826125789148606}
42+
m_Enabled: 1
43+
m_EditorHideFlags: 0
44+
m_Script: {fileID: 11500000, guid: f37253140773b4148bf3983f442a400f, type: 3}
45+
m_Name:
46+
m_EditorClassIdentifier:
47+
syncInterval: 0.1
48+
characterName: Jose Delgado
49+
characterHP: 4
50+
--- !u!114 &490826125789148607
51+
MonoBehaviour:
52+
m_ObjectHideFlags: 0
53+
m_CorrespondingSourceObject: {fileID: 0}
54+
m_PrefabInstance: {fileID: 0}
55+
m_PrefabAsset: {fileID: 0}
56+
m_GameObject: {fileID: 490826125789148606}
57+
m_Enabled: 1
58+
m_EditorHideFlags: 0
59+
m_Script: {fileID: 11500000, guid: 9b91ecbcc199f4492b9a91e820070131, type: 3}
60+
m_Name:
61+
m_EditorClassIdentifier:
62+
serverOnly: 0
63+
localPlayerAuthority: 0
64+
m_AssetId: 0a862e7a025801c45ad8ce3e4b4d0989
65+
m_SceneId: 0

‎Assets/Prefabs/Character/Jose Delgado.prefab.meta

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/Scenes/MultiplayerLocal.unity

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,8 @@ LightmapSettings:
9494
m_PVRFilteringAtrousPositionSigmaDirect: 0.5
9595
m_PVRFilteringAtrousPositionSigmaIndirect: 2
9696
m_PVRFilteringAtrousPositionSigmaAO: 1
97-
m_ShowResolutionOverlay: 1
9897
m_ExportTrainingData: 0
98+
m_TrainingDataDestination: TrainingData
9999
m_LightingDataAsset: {fileID: 0}
100100
m_UseShadowmask: 1
101101
--- !u!196 &4
@@ -181,6 +181,7 @@ MonoBehaviour:
181181
- {fileID: 1384557101617452, guid: 0ad4a65027c4c194a94b3260bc270dbd, type: 3}
182182
- {fileID: 1097694930350580, guid: e4a27e0db3f718b43b4ed9e8ef890cb2, type: 3}
183183
- {fileID: 1110412893228910, guid: 386232d7bbf0cc4439cea08a7ab6b0c8, type: 3}
184+
- {fileID: 490826125789148606, guid: 0a862e7a025801c45ad8ce3e4b4d0989, type: 3}
184185
- {fileID: 1002505776817526, guid: 9cd9c079bd1285c4ba781ed771fae15f, type: 3}
185186
- {fileID: 7915496552382078933, guid: aa7268b72eec4874e96bd686dc95013e, type: 3}
186187
- {fileID: 5389608874815740603, guid: fc53ac13cda49da46a0ee5659408cdaa, type: 3}
@@ -386,7 +387,7 @@ MonoBehaviour:
386387
m_GameObject: {fileID: 1202136533}
387388
m_Enabled: 1
388389
m_EditorHideFlags: 0
389-
m_Script: {fileID: 1077351063, guid: f70555f144d8491a825f0804e09c671c, type: 3}
390+
m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3}
390391
m_Name:
391392
m_EditorClassIdentifier:
392393
m_HorizontalAxis: Horizontal
@@ -405,7 +406,7 @@ MonoBehaviour:
405406
m_GameObject: {fileID: 1202136533}
406407
m_Enabled: 1
407408
m_EditorHideFlags: 0
408-
m_Script: {fileID: -619905303, guid: f70555f144d8491a825f0804e09c671c, type: 3}
409+
m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3}
409410
m_Name:
410411
m_EditorClassIdentifier:
411412
m_FirstSelected: {fileID: 0}

‎Assets/Scripts/Cards/Card.cs

Lines changed: 79 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -1,79 +1,80 @@
1-
using System.Collections;
2-
using UnityEngine;
3-
namespace PimPamPum
4-
{
5-
public abstract class Card
6-
{
7-
private static Color brownCard = Color.red;
8-
9-
public virtual Suit Suit => Struct.suit;
10-
11-
public virtual Rank Rank => Struct.rank;
12-
13-
public bool IsRed => Suit == Suit.Hearts || Suit == Suit.Diamonds;
14-
15-
public CardStruct Struct
16-
{
17-
get; protected set;
18-
}
19-
20-
public virtual Card Original => null;
21-
22-
public virtual Color Color => brownCard;
23-
24-
public virtual bool Is<T>() where T : Card, new()
25-
{
26-
return this is T;
27-
}
28-
29-
protected void SetSuitRank(Suit suit = Suit.Null, Rank rank = Rank.Null)
30-
{
31-
Struct = new CardStruct
32-
{
33-
suit = suit,
34-
rank = rank,
35-
name = ToString(),
36-
color = Color
37-
};
38-
}
39-
40-
public virtual void BeginCardDrag(PlayerController pc)
41-
{
42-
pc.BeginCardDrag(this);
43-
}
44-
45-
public virtual IEnumerator PlayCard(PlayerController pc, int player, Drop drop, int cardIndex)
46-
{
47-
yield return CardEvent(pc, player, drop, cardIndex);
48-
yield return CardEffect(pc, player, drop, cardIndex);
49-
yield return CardUsed(pc);
50-
pc.FinishCardUsed();
51-
}
52-
53-
protected virtual IEnumerator CardEffect(PlayerController pc, int player, Drop drop, int cardIndex)
54-
{
55-
pc.DiscardCardUsed();
56-
yield return null;
57-
}
58-
59-
protected virtual IEnumerator CardEvent(PlayerController pc, int player, Drop drop, int cardIndex)
60-
{
61-
yield return GameController.Instance.PimPamPumEventPlayedCard(pc.PlayerNumber, player, this, drop, cardIndex);
62-
}
63-
64-
public abstract IEnumerator CardUsed(PlayerController pc);
65-
66-
public Card ConvertTo<T>() where T : Card, new()
67-
{
68-
Card converted = new T();
69-
return new ConvertedCard(this, converted);
70-
}
71-
72-
public static Card CreateNew<T>(Suit suit, Rank rank) where T : Card, new()
73-
{
74-
Card res = new T();
75-
res.SetSuitRank(suit, rank);
76-
return res;
77-
}
78-
}
1+
using System.Collections;
2+
using UnityEngine;
3+
4+
namespace PimPamPum
5+
{
6+
public abstract class Card
7+
{
8+
private static Color brownCard = Color.red;
9+
10+
public virtual Suit Suit => Struct.suit;
11+
12+
public virtual Rank Rank => Struct.rank;
13+
14+
public bool IsRed => Suit == Suit.Hearts || Suit == Suit.Diamonds;
15+
16+
public CardStruct Struct
17+
{
18+
get; protected set;
19+
}
20+
21+
public virtual Card Original => null;
22+
23+
public virtual Color Color => brownCard;
24+
25+
public virtual bool Is<T>() where T : Card
26+
{
27+
return this is T;
28+
}
29+
30+
protected void SetSuitRank(Suit suit = Suit.Null, Rank rank = Rank.Null)
31+
{
32+
Struct = new CardStruct
33+
{
34+
suit = suit,
35+
rank = rank,
36+
name = ToString(),
37+
color = Color
38+
};
39+
}
40+
41+
public virtual void BeginCardDrag(PlayerController pc)
42+
{
43+
pc.BeginCardDrag(this);
44+
}
45+
46+
public virtual IEnumerator PlayCard(PlayerController pc, int player, Drop drop, int cardIndex)
47+
{
48+
yield return CardEvent(pc, player, drop, cardIndex);
49+
yield return CardEffect(pc, player, drop, cardIndex);
50+
yield return CardUsed(pc);
51+
pc.FinishCardUsed();
52+
}
53+
54+
protected virtual IEnumerator CardEffect(PlayerController pc, int player, Drop drop, int cardIndex)
55+
{
56+
pc.DiscardCardUsed();
57+
yield return null;
58+
}
59+
60+
protected virtual IEnumerator CardEvent(PlayerController pc, int player, Drop drop, int cardIndex)
61+
{
62+
yield return GameController.Instance.PimPamPumEventPlayedCard(pc.PlayerNumber, player, this, drop, cardIndex);
63+
}
64+
65+
public abstract IEnumerator CardUsed(PlayerController pc);
66+
67+
public Card ConvertTo<T>() where T : Card, new()
68+
{
69+
Card converted = new T();
70+
return new ConvertedCard(this, converted);
71+
}
72+
73+
public static Card CreateNew<T>(Suit suit, Rank rank) where T : Card, new()
74+
{
75+
Card res = new T();
76+
res.SetSuitRank(suit, rank);
77+
return res;
78+
}
79+
}
7980
}

‎Assets/Scripts/Cards/Missed.cs

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,22 @@
1-
using System.Collections;
2-
namespace PimPamPum
3-
{
4-
public class Missed : Card
5-
{
6-
protected override IEnumerator CardEffect(PlayerController pc, int player, Drop drop, int cardIndex)
7-
{
8-
yield return null;
9-
}
10-
11-
public override IEnumerator CardUsed(PlayerController pc)
12-
{
13-
yield return GameController.Instance.UsedCard<Missed>(pc);
14-
}
15-
16-
public override string ToString()
17-
{
18-
return "Missed";
19-
}
20-
}
1+
using System.Collections;
2+
3+
namespace PimPamPum
4+
{
5+
public class Missed : Card
6+
{
7+
protected override IEnumerator CardEffect(PlayerController pc, int player, Drop drop, int cardIndex)
8+
{
9+
yield return null;
10+
}
11+
12+
public override IEnumerator CardUsed(PlayerController pc)
13+
{
14+
yield return GameController.Instance.UsedCard<Missed>(pc);
15+
}
16+
17+
public override string ToString()
18+
{
19+
return "Missed";
20+
}
21+
}
2122
}

‎Assets/Scripts/Cards/Properties/Barrel.cs

Lines changed: 42 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,43 @@
1-
using System.Collections;
2-
namespace PimPamPum
3-
{
4-
public class Barrel : Property, ICondition
5-
{
6-
public override void BeginCardDrag(PlayerController pc)
7-
{
8-
base.BeginCardDrag(pc);
9-
pc.SelfTargetPropertyCard<Barrel>();
10-
}
11-
12-
public override void AddPropertyEffect(PlayerController pc)
13-
{
14-
pc.EquipBarrel();
15-
}
16-
17-
public override void RemovePropertyEffect(PlayerController pc)
18-
{
19-
pc.UnequipBarrel();
20-
}
21-
22-
public bool CheckCondition(Card c)
23-
{
24-
return c.Suit == Suit.Hearts;
25-
}
26-
27-
protected override IEnumerator EquipTrigger(PlayerController pc)
28-
{
29-
yield return pc.Equip<Barrel>(this);
30-
}
31-
32-
public override IEnumerator CardUsed(PlayerController pc)
33-
{
34-
yield return GameController.Instance.UsedCard<Barrel>(pc);
35-
}
36-
37-
public override string ToString()
38-
{
39-
return "Barrel";
40-
}
41-
}
1+
using System.Collections;
2+
3+
namespace PimPamPum
4+
{
5+
public class Barrel : Property, ICondition
6+
{
7+
public override void BeginCardDrag(PlayerController pc)
8+
{
9+
base.BeginCardDrag(pc);
10+
pc.SelfTargetPropertyCard<Barrel>();
11+
}
12+
13+
public override void AddPropertyEffect(PlayerController pc)
14+
{
15+
pc.EquipBarrel();
16+
}
17+
18+
public override void RemovePropertyEffect(PlayerController pc)
19+
{
20+
pc.UnequipBarrel();
21+
}
22+
23+
public bool CheckCondition(Card c)
24+
{
25+
return c.Suit == Suit.Hearts;
26+
}
27+
28+
protected override IEnumerator EquipTrigger(PlayerController pc)
29+
{
30+
yield return pc.Equip<Barrel>(this);
31+
}
32+
33+
public override IEnumerator CardUsed(PlayerController pc)
34+
{
35+
yield return GameController.Instance.UsedCard<Barrel>(pc);
36+
}
37+
38+
public override string ToString()
39+
{
40+
return "Barrel";
41+
}
42+
}
4243
}

0 commit comments

Comments
 (0)