[Fix] Conflicts
This commit is contained in:
@@ -142,7 +142,7 @@ namespace YachtDice.Tests
|
||||
[Test]
|
||||
public void TryPurchase_DiceItem_AddsToDiceCollection()
|
||||
{
|
||||
var die = DiceDefinitionSO.CreateForTest<StandardDiceSO>("test_die", shopPrice: 100);
|
||||
var die = DiceDefinition.CreateForTest<StandardDice>("test_die", shopPrice: 100);
|
||||
|
||||
bool result = shop.TryPurchase(die);
|
||||
|
||||
@@ -154,7 +154,7 @@ namespace YachtDice.Tests
|
||||
[Test]
|
||||
public void TryPurchase_DiceItem_CannotBeBoughtTwice()
|
||||
{
|
||||
var die = DiceDefinitionSO.CreateForTest<StandardDiceSO>("unique_die", shopPrice: 100);
|
||||
var die = DiceDefinition.CreateForTest<StandardDice>("unique_die", shopPrice: 100);
|
||||
|
||||
shop.TryPurchase(die);
|
||||
bool secondResult = shop.TryPurchase(die);
|
||||
@@ -167,7 +167,7 @@ namespace YachtDice.Tests
|
||||
[Test]
|
||||
public void GetItemState_Dice_Owned_AfterPurchase()
|
||||
{
|
||||
var die = DiceDefinitionSO.CreateForTest<StandardDiceSO>("die1", shopPrice: 50);
|
||||
var die = DiceDefinition.CreateForTest<StandardDice>("die1", shopPrice: 50);
|
||||
|
||||
shop.TryPurchase(die);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user