Nicola/TalesOfNovariel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reworked code, Code cleanup, No new Version

Browse Source
This commit is contained in:
Finnchen123
2023-04-14 20:25:54 +02:00
parent 3e2edced88
commit c32e634c02
63 changed files with 291 additions and 74895 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
Assets/Prefabs/PineTree.prefab
View File

@@ -9,9 +9,9 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 6403671343560478198}
- component: {fileID: 6403671343560478197}
- component: {fileID: 8376604988453278612}
- component: {fileID: 1614156360672071162}
- component: {fileID: 5116785560581361872}
m_Layer: 0
m_Name: PineTree
m_TagString: Object:Tree
@@ -29,11 +29,41 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 2, y: 6, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &6403671343560478197
--- !u!54 &8376604988453278612
Rigidbody:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6403671343560478196}
serializedVersion: 2
m_Mass: 1
m_Drag: 0
m_AngularDrag: 0.05
m_UseGravity: 1
m_IsKinematic: 0
m_Interpolate: 0
m_Constraints: 90
m_CollisionDetection: 0
--- !u!65 &1614156360672071162
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6403671343560478196}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 1.28, y: 1.28, z: 0.2}
m_Center: {x: 0, y: 0, z: 0}
--- !u!212 &5116785560581361872
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -41,9 +71,10 @@ SpriteRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6403671343560478196}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
@@ -84,32 +115,3 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!54 &8376604988453278612
Rigidbody:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6403671343560478196}
serializedVersion: 2
m_Mass: 1
m_Drag: 0
m_AngularDrag: 0.05
m_UseGravity: 1
m_IsKinematic: 0
m_Interpolate: 0
m_Constraints: 90
m_CollisionDetection: 0
--- !u!65 &1614156360672071162
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6403671343560478196}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 1.28, y: 1.28, z: 0.2}
m_Center: {x: 0, y: 0, z: 0}

183
Assets/Prefabs/craftable.prefab
View File

@@ -1,183 +0,0 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &1447051553155802074
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1447051553155802073}
- component: {fileID: 1447051553155802079}
- component: {fileID: 1447051553155802072}
m_Layer: 5
m_Name: icon
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1447051553155802073
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1447051553155802074}
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: 1447051553851155087}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: -10, y: -10}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1447051553155802079
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1447051553155802074}
m_CullTransparentMesh: 1
--- !u!114 &1447051553155802072
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1447051553155802074}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Texture: {fileID: 0}
m_UVRect:
serializedVersion: 2
x: 0
y: 0
width: 1
height: 1
--- !u!1 &1447051553616085063
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1447051553616085062}
- component: {fileID: 1447051553616085060}
- component: {fileID: 1447051553616085061}
m_Layer: 5
m_Name: background
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1447051553616085062
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1447051553616085063}
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: 1447051553851155087}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: -10, y: -10}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1447051553616085060
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1447051553616085063}
m_CullTransparentMesh: 1
--- !u!114 &1447051553616085061
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1447051553616085063}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Texture: {fileID: 0}
m_UVRect:
serializedVersion: 2
x: 0
y: 0
width: 1
height: 1
--- !u!1 &1447051553851155080
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1447051553851155087}
m_Layer: 5
m_Name: craftable
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1447051553851155087
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1447051553851155080}
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:
- {fileID: 1447051553616085062}
- {fileID: 1447051553155802073}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 75, y: 0}
m_SizeDelta: {x: 100, y: 0}
m_Pivot: {x: 0.5, y: 0.5}

7
Assets/Prefabs/craftable.prefab.meta
View File

@@ -1,7 +0,0 @@
fileFormatVersion: 2
guid: 9897f5d0e84917342828166d8fce361c
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

74
Assets/Prefabs/craftingRecipe.prefab
View File

@@ -1,74 +0,0 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &1237241787062479250
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3230771289994164044}
- component: {fileID: 4593984540951252618}
- component: {fileID: 561032699250191462}
m_Layer: 5
m_Name: craftingRecipe
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &3230771289994164044
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1237241787062479250}
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: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.1}
m_AnchorMax: {x: 0.1, y: 0.9}
m_AnchoredPosition: {x: 7.5, y: 0}
m_SizeDelta: {x: -15, y: -10}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4593984540951252618
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1237241787062479250}
m_CullTransparentMesh: 1
--- !u!114 &561032699250191462
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1237241787062479250}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Texture: {fileID: 0}
m_UVRect:
serializedVersion: 2
x: 0
y: 0
width: 1
height: 1

7
Assets/Prefabs/craftingRecipe.prefab.meta
View File

@@ -1,7 +0,0 @@
fileFormatVersion: 2
guid: e0c3446688e484b41b344561c53a3245
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

21
Assets/Scenes/GameScene.unity
View File

@@ -935,7 +935,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &66523172
RectTransform:
m_ObjectHideFlags: 0
@@ -1988,7 +1988,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &125253396
RectTransform:
m_ObjectHideFlags: 0
@@ -20206,6 +20206,7 @@ Animator:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorStateOnDisable: 0
m_WriteDefaultValuesOnDisable: 0
--- !u!1 &1469570407
GameObject:
m_ObjectHideFlags: 0
@@ -21807,10 +21808,18 @@ PrefabInstance:
propertyPath: m_StaticEditorFlags
value: 4294967295
objectReference: {fileID: 0}
- target: {fileID: 6403671343560478197, guid: 87e9f873ffc561445805b7e8674d1cab, type: 3}
propertyPath: m_DrawMode
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6403671343560478197, guid: 87e9f873ffc561445805b7e8674d1cab, type: 3}
propertyPath: m_ReceiveShadows
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6403671343560478197, guid: 87e9f873ffc561445805b7e8674d1cab, type: 3}
propertyPath: m_MaskInteraction
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6403671343560478198, guid: 87e9f873ffc561445805b7e8674d1cab, type: 3}
propertyPath: m_RootOrder
value: 1
@@ -21829,7 +21838,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 6403671343560478198, guid: 87e9f873ffc561445805b7e8674d1cab, type: 3}
propertyPath: m_LocalPosition.y
value: 4.5
value: 4
objectReference: {fileID: 0}
- target: {fileID: 6403671343560478198, guid: 87e9f873ffc561445805b7e8674d1cab, type: 3}
propertyPath: m_LocalPosition.z
@@ -21863,6 +21872,10 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7190563918972443284, guid: 87e9f873ffc561445805b7e8674d1cab, type: 3}
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 87e9f873ffc561445805b7e8674d1cab, type: 3}
--- !u!1 &1623671172
@@ -22226,7 +22239,7 @@ MonoBehaviour:
m_HandleRect: {fileID: 681295929}
m_Direction: 2
m_Value: 1
m_Size: 0.4374999
m_Size: 0.43750003
m_NumberOfSteps: 0
m_OnValueChanged:
m_PersistentCalls:

2
Assets/Scripts/Controls.cs
View File

@@ -59,7 +59,7 @@ public class Controls : MonoBehaviour
Destroy(target);
break;
case "Stone":
GameObject.Find("Inventory").GetComponent<Inventory>().addItem(new Item("Stone"));
GameObject.Find("Inventory").GetComponent<Inventory>().addItem(new Item("Rock"));
Destroy(target);
break;
case "NPC":

2
Assets/com.rlabrecque.steamworks.net.meta → Assets/Scripts/Handler.meta
View File

@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 64c2f7c4937560c4e91a13674c1677fe
guid: 71efee93c90768be4812cb603d42dc98
folderAsset: yes
DefaultImporter:
externalObjects: {}

0
Assets/Scripts/AudioHandler.cs → Assets/Scripts/Handler/AudioHandler.cs
View File

0
Assets/Scripts/AudioHandler.cs.meta → Assets/Scripts/Handler/AudioHandler.cs.meta
View File

0
Assets/Scripts/ButtonHandler.cs → Assets/Scripts/Handler/ButtonHandler.cs
View File

0
Assets/Scripts/ButtonHandler.cs.meta → Assets/Scripts/Handler/ButtonHandler.cs.meta
View File

0
Assets/Scripts/EasterEggHandler.cs → Assets/Scripts/Handler/EasterEggHandler.cs
View File

0
Assets/Scripts/EasterEggHandler.cs.meta → Assets/Scripts/Handler/EasterEggHandler.cs.meta
View File

0
Assets/Scripts/FileHandler.cs → Assets/Scripts/Handler/FileHandler.cs
View File

0
Assets/Scripts/FileHandler.cs.meta → Assets/Scripts/Handler/FileHandler.cs.meta
View File

12
Assets/Scripts/SceneHandler.cs → Assets/Scripts/Handler/SceneHandler.cs
View File

@@ -29,18 +29,6 @@ namespace Assets.Scripts
}
}
// Start is called before the first frame update
void Start()
{
}
// Update is called once per frame
void Update()
{
}
public void openMenuScene()
{
SceneManager.LoadSceneAsync("MenuScene", LoadSceneMode.Single);

0
Assets/Scripts/SceneHandler.cs.meta → Assets/Scripts/Handler/SceneHandler.cs.meta
View File

0
Assets/Scripts/SteamWorksHandler.cs → Assets/Scripts/Handler/SteamWorksHandler.cs
View File

0
Assets/Scripts/SteamWorksHandler.cs.meta → Assets/Scripts/Handler/SteamWorksHandler.cs.meta
View File

0
Assets/Scripts/TooltipHandler.cs → Assets/Scripts/Handler/TooltipHandler.cs
View File

0
Assets/Scripts/TooltipHandler.cs.meta → Assets/Scripts/Handler/TooltipHandler.cs.meta
View File

0
Assets/Scripts/UIHandler.cs → Assets/Scripts/Handler/UIHandler.cs
View File

0
Assets/Scripts/UIHandler.cs.meta → Assets/Scripts/Handler/UIHandler.cs.meta
View File

17
Assets/Scripts/House.cs
View File

@@ -33,11 +33,17 @@ namespace Assets.Scripts
}
else
{
playerPosition = GameObject.Find("Player").transform.position;
houseInstance = Instantiate(houseObject);
houseInstance.transform.position = new Vector3(playerPosition.x, 50, playerPosition.z);
houseInstance.transform.localScale = new Vector3(1, 1, 1);
GameObject.Find("Player").transform.position = new Vector3(playerPosition.x, 51, playerPosition.z);
int openChance = new System.Random().Next(4);
if(openChance == 0){
playerPosition = GameObject.Find("Player").transform.position;
houseInstance = Instantiate(houseObject);
houseInstance.transform.position = new Vector3(playerPosition.x, 50, playerPosition.z);
houseInstance.transform.localScale = new Vector3(1, 1, 1);
GameObject.Find("Player").transform.position = new Vector3(playerPosition.x, 51, playerPosition.z);
}
else{
GameObject.Find("UIHandler").GetComponent<UIHandler>().showMessage("ERROR;This house is locked.");
}
}
hasInteracted = true;
}
@@ -56,6 +62,7 @@ namespace Assets.Scripts
switch (type)
{
case 0:
// Maybe add luck to increase chance for equipment
item = new Equipment(luck);
break;
case 1:

4
Assets/Scripts/Inventory.cs
View File

@@ -187,7 +187,7 @@ namespace Assets.Scripts
return startDrag;
}
public Item getEquip(ItemPlace place)
/*public Item getEquip(ItemPlace place)
{
switch (place)
{
@@ -210,7 +210,7 @@ namespace Assets.Scripts
default:
return null;
}
}
}*/
public void calculateStatBoost(Dictionary<string, int> attributes, bool isAddition)
{

8
Assets/Scripts/Items/Item.cs
View File

@@ -89,7 +89,7 @@ namespace Assets.Scripts
case "Wood":
image = Resources.Load<Texture>("Items/Inv_Wood");
break;
case "Stone":
case "Rock":
image = Resources.Load<Texture>("Items/Inv_Stone");
break;
}
@@ -129,8 +129,8 @@ namespace Assets.Scripts
case "Wood":
result = "Quite a nice piece of wood";
break;
case "Stone":
result = "A small stone to craft with";
case "Rock":
result = "Is it... Dwayne?";
break;
}
return result;
@@ -156,7 +156,7 @@ namespace Assets.Scripts
endDrag.setItem(this, startDrag.getCurrentBag());
}
private void chooseItem()
{
/* Common: Slimeball

5
Assets/Scripts/Menu/UIHandlerMenu.cs
View File

@@ -23,11 +23,6 @@ namespace Assets.Scripts.Menu
SteamWorksHandler.getStandardAchievement("StartAchievement");
}
void Update()
{
}
public void startGame(SceneHandler sceneHandler)
{
int cityAmount = 0;

203
Assets/Scripts/NewTileScript.cs
View File

@@ -1,203 +0,0 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class NewTileScript : MonoBehaviour
{
Vector3 position;
float borderNorth;
float borderEast;
float borderSouth;
float borderWest;
System.Random rand = new System.Random();
string tilename;
GameObject contentGenerator;
List<GameObject> aliveEnemies = new List<GameObject>();
List<GameObject> deadEnemies = new List<GameObject>();
public void generateTile(Vector3 pos, string name)
{
tilename = name;
//contentGenerator = GameObject.Find("ContentGenerator");
setPosition(pos);
setBorders();
//generateContent();
}
public void setBorders()
{
borderNorth = position.z * 100 + 50;
borderEast = position.x * 100 + 50;
borderSouth = position.z * 100 - 50;
borderWest = position.x * 100 - 50;
}
public void generateContent()
{
if (!tilename.ToLower().Equals("City"))
{
foreach (Vector3 position in getSpawnLocations())
{
spawnObject(position);
}
}
}
public List<Vector3> getSpawnLocations()
{
List<Vector3> list = new List<Vector3>();
int xChange = 0;
int zChange = 0;
for (float i = borderNorth - 10; i >= borderSouth + 10; i = i - 10)
{
for (float j = borderWest + 10; j <= borderEast - 10; j = j + 10)
{
xChange = rand.Next(-4, +4);
zChange = rand.Next(-4, +4);
list.Add(new Vector3(j + xChange, 5, i + zChange));
}
}
return list;
}
public void spawnObject(Vector3 position)
{
int chance = rand.Next(1, 101);
if (chance >= 50)
{
GameObject content = contentGenerator.GetComponent<ContentGenerator>().generateContent(tilename);
if (content != null)
{
GameObject obj = Instantiate(content, position, Quaternion.identity);
obj.transform.parent = gameObject.transform;
if (obj.tag.Contains("Enemy"))
{
aliveEnemies.Add(obj);
}
}
}
}
public void setPosition(Vector3 position)
{
this.position = position;
}
public Vector3 getPosition()
{
return position;
}
public bool leftTile(float playerX, float playerZ)
{
bool result = false;
if (playerX >= borderEast + 10 || playerX <= borderWest - 10 || playerZ >= borderNorth + 10 || playerZ <= borderSouth - 10)
{
changeRenderer();
result = true;
}
return result;
}
public void changeRenderer()
{
foreach (Rigidbody rigid in gameObject.GetComponentsInChildren<Rigidbody>())
{
if (!deadEnemies.Contains(rigid.gameObject))
{
rigid.useGravity = !rigid.useGravity;
}
}
foreach (Renderer rend in gameObject.GetComponentsInChildren<Renderer>())
{
if (!deadEnemies.Contains(rend.gameObject))
{
rend.enabled = !rend.enabled;
}
}
foreach (Collider col in gameObject.GetComponentsInChildren<Collider>())
{
if (!deadEnemies.Contains(col.gameObject))
{
col.enabled = !col.enabled;
}
}
}
public void resetSpawn()
{
foreach (Rigidbody rigid in gameObject.GetComponentsInChildren<Rigidbody>())
{
rigid.useGravity = true;
}
foreach (Renderer rend in gameObject.GetComponentsInChildren<Renderer>())
{
rend.enabled = true;
}
foreach (Collider col in gameObject.GetComponentsInChildren<Collider>())
{
col.enabled = true;
}
}
public bool enteredTile(float playerX, float playerZ)
{
bool result = false;
if (playerX <= borderEast && playerX >= borderWest && playerZ <= borderNorth && playerZ >= borderSouth)
{
result = true;
}
return result;
}
public Vector3 needConnectedTile(float playerX, float playerZ)
{
Vector3 result = new Vector3(position.x, 1, position.z);
if (playerX >= borderEast - 10)
{
result.x = result.x + 1;
result.y = 0;
}
else if (playerX <= borderWest + 10)
{
result.x = result.x - 1;
result.y = 0;
}
if (playerZ >= borderNorth - 10)
{
result.z = result.z + 1;
result.y = 0;
}
else if (playerZ <= borderSouth + 10)
{
result.z = result.z - 1;
result.y = 0;
}
return result;
}
public bool removeConnectedTiles(float playerX, float playerZ)
{
bool result = false;
if (playerX <= borderEast - 10 && playerX >= borderWest + 10 && playerZ <= borderNorth - 10 && playerZ >= borderSouth + 10)
{
result = true;
}
return result;
}
public void enemyKilled(GameObject enemy)
{
deadEnemies.Add(enemy);
enemy.GetComponent<Rigidbody>().useGravity = false;
enemy.GetComponent<Renderer>().enabled = false;
enemy.GetComponent<Collider>().enabled = false;
aliveEnemies.Remove(enemy);
}
}

11
Assets/Scripts/NewTileScript.cs.meta
View File

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

2
Assets/Scripts/PlayerCamera.cs
View File

@@ -53,7 +53,7 @@ namespace Assets.Scripts
displayInformation("Tree");
break;
case "stone":
displayInformation("Stone");
displayInformation("Rock");
break;
case "npc":
displayInformation("NPC");

6
Assets/Scripts/Quests/CollectQuest.cs
View File

@@ -20,8 +20,8 @@ namespace Assets.Scripts
keyword = "Slimeball";
break;
case 1:
questname = questname + "stones";
keyword = "Stone";
questname = questname + "rocks";
keyword = "Rock";
break;
case 2:
questname = questname + "wood";
@@ -102,7 +102,7 @@ namespace Assets.Scripts
{
return true;
}
if (keyword == "Stone" && item.getName().ToLower().Contains("stone"))
if (keyword == "Rock" && item.getName().ToLower().Contains("rock"))
{
return true;
}

8
Assets/Storage.meta
View File

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