sprechtl/Foerming
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'dhain' into develop

Browse source 
# Conflicts:
#	Assets/Scenes/MainScene.unity
#	Assets/Scripts/PlayerController.cs
This commit is contained in:
dhain 2022-05-19 16:07:18 +02:00
commit 7a04d79aba
118 changed files with 14104 additions and 135 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Assets/Scripts/Items/FishingRod.cs
View file

@ -1,7 +0,0 @@
using UnityEngine;
namespace Items {
public class FishingRod : UsableItem {
public FishingRod() : base("Fishing Rod", "Can be used to fish fishy fish.", 1) { }
}
}

11
Assets/Scripts/Items/FishingRod.cs.meta
View file

@ -1,11 +0,0 @@
fileFormatVersion: 2
guid: b08796f3a5662aa43a460c7ddd6796b3
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

9
Assets/Scripts/Items/Hoe.cs
View file

@ -1,9 +0,0 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
namespace Items {
public class Hoe : UsableItem {
public Hoe() : base("Hoe", "Used to hoe the ground into farmland.", 2){}
}
}

11
Assets/Scripts/Items/Hoe.cs.meta
View file

@ -1,11 +0,0 @@
fileFormatVersion: 2
guid: aa6ceecfb09ac614997702b2caf66e33
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

9
Assets/Scripts/Items/Scythe.cs
View file

@ -1,9 +0,0 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
namespace Items {
public class Scythe : UsableItem {
public Scythe() : base("Scythe", "Used to cut down crops.", 3){}
}
}

11
Assets/Scripts/Items/Scythe.cs.meta
View file

@ -1,11 +0,0 @@
fileFormatVersion: 2
guid: 641048df0d7668f48a857c454e2bd320
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

8
Assets/Scripts/Items/TerraformingTools.meta Normal file
View file

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 3e2b622f17cf8c54c96818c5850d4c76
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

9
Assets/Scripts/Items/WateringCan.cs
View file

@ -1,9 +0,0 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
namespace Items {
public class WateringCan : UsableItem {
public WateringCan():base("Watering Can", "Used to water planted crops.", 4){}
}
}

11
Assets/Scripts/Items/WateringCan.cs.meta
View file

@ -1,11 +0,0 @@
fileFormatVersion: 2
guid: 7e19228f49932534e8af0218c51e5c63
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

9
Assets/Scripts/Items/Wheat.cs
View file

@ -1,9 +0,0 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
namespace Items {
public class Wheat : Item {
public Wheat() : base("Wheat", "Wheat is a grass widely cultivated for its seed, a cereal grain which is a worldwide staple food.", 5){}
}
}

11
Assets/Scripts/Items/Wheat.cs.meta
View file

@ -1,11 +0,0 @@
fileFormatVersion: 2
guid: 207be0ed7f8f5714c97b7ac5deb8956d
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

9
Assets/Scripts/Items/WheatSeed.cs
View file

@ -1,9 +0,0 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
namespace Items {
public class WheatSeed : UsableItem {
public WheatSeed() : base("Wheat Seeds", "When planted on farmland, wheat will grow.", 6){}
}
}

11
Assets/Scripts/Items/WheatSeed.cs.meta
View file

@ -1,11 +0,0 @@
fileFormatVersion: 2
guid: 0808be748388ede4ba57db7d74401617
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant: