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

fixed ui, localization and save/load

Browse Source
This commit is contained in:
TAASONI3 2023-12-13 13:40:32 +01:00
parent 884a17f330
commit 5583440b7e
11 changed files with 179 additions and 336 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Assets/Locals/StringTable/MyTexts Shared Data.asset
View File

@ -928,7 +928,7 @@ MonoBehaviour:
m_Metadata:
m_Items: []
- m_Id: 236911118249984
m_Key: mountain
m_Key: mountains
m_Metadata:
m_Items: []
- m_Id: 13166294331393
@ -1300,6 +1300,14 @@ MonoBehaviour:
(Legacy) (7)
m_Metadata:
m_Items: []
- m_Id: 58618673139056640
m_Key: hills
m_Metadata:
m_Items: []
- m_Id: 58619037066231808
m_Key: desert
m_Metadata:
m_Items: []
m_Metadata:
m_Items: []
m_KeyGenerator:

10
Assets/Locals/StringTable/MyTexts_de.asset
View File

@ -1062,7 +1062,7 @@ MonoBehaviour:
m_Metadata:
m_Items: []
- m_Id: 236911118249984
m_Localized: Berg
m_Localized: Berge
m_Metadata:
m_Items: []
- m_Id: 236988465410048
@ -1309,6 +1309,14 @@ MonoBehaviour:
m_Localized: Charakterfenster
m_Metadata:
m_Items: []
- m_Id: 58618673139056640
m_Localized: "H\xFCgel"
m_Metadata:
m_Items: []
- m_Id: 58619037066231808
m_Localized: "W\xFCste"
m_Metadata:
m_Items: []
references:
version: 2
RefIds: []

10
Assets/Locals/StringTable/MyTexts_en.asset
View File

@ -1105,7 +1105,7 @@ MonoBehaviour:
m_Metadata:
m_Items: []
- m_Id: 236911118249984
m_Localized: Mountain
m_Localized: Mountains
m_Metadata:
m_Items: []
- m_Id: 236988465410048
@ -1352,6 +1352,14 @@ MonoBehaviour:
m_Localized: Charactersheet
m_Metadata:
m_Items: []
- m_Id: 58618673139056640
m_Localized: Hills
m_Metadata:
m_Items: []
- m_Id: 58619037066231808
m_Localized: Desert
m_Metadata:
m_Items: []
references:
version: 2
RefIds: []

216
Assets/Prefabs/newTile.prefab
View File

@ -1,111 +1,5 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &853962700825142131
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2302054554406120191}
- component: {fileID: 7930237308982353602}
m_Layer: 0
m_Name: borderEast
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &2302054554406120191
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 853962700825142131}
serializedVersion: 2
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_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 7573435787306895636}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!65 &7930237308982353602
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 853962700825142131}
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_LayerOverridePriority: 0
m_IsTrigger: 1
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 3
m_Size: {x: 1, y: 50, z: 10}
m_Center: {x: 4.5, y: 10, z: 0}
--- !u!1 &1105542063898681048
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8675574615724103168}
- component: {fileID: 5060182090080639643}
m_Layer: 0
m_Name: borderWest
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &8675574615724103168
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1105542063898681048}
serializedVersion: 2
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_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 7573435787306895636}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!65 &5060182090080639643
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1105542063898681048}
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_LayerOverridePriority: 0
m_IsTrigger: 1
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 3
m_Size: {x: 1, y: 50, z: 10}
m_Center: {x: -4.5, y: 10, z: 0}
--- !u!1 &1432760222041494230
GameObject:
m_ObjectHideFlags: 0
@ -225,59 +119,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 0d2f50a8e0bb841a5aaa90ae55db8849, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &6123336807212193309
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6802392361063389519}
- component: {fileID: 7259734393543055140}
m_Layer: 0
m_Name: borderNorth
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &6802392361063389519
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6123336807212193309}
serializedVersion: 2
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_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 7573435787306895636}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!65 &7259734393543055140
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6123336807212193309}
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_LayerOverridePriority: 0
m_IsTrigger: 1
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 3
m_Size: {x: 10, y: 50, z: 1}
m_Center: {x: 0, y: 10, z: 4.5}
--- !u!1 &7573435787306895624
GameObject:
m_ObjectHideFlags: 0
@ -313,10 +154,6 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 1418724594657166519}
- {fileID: 6802392361063389519}
- {fileID: 3477629701989741973}
- {fileID: 2302054554406120191}
- {fileID: 8675574615724103168}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &7573435787306895637
@ -424,56 +261,3 @@ BoxCollider:
serializedVersion: 3
m_Size: {x: 10, y: 50, z: 10}
m_Center: {x: 0, y: 10, z: 0}
--- !u!1 &7947202897621284699
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3477629701989741973}
- component: {fileID: 6619435022680525770}
m_Layer: 0
m_Name: borderSouth
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &3477629701989741973
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7947202897621284699}
serializedVersion: 2
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_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 7573435787306895636}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!65 &6619435022680525770
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7947202897621284699}
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_LayerOverridePriority: 0
m_IsTrigger: 1
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 3
m_Size: {x: 10, y: 50, z: 1}
m_Center: {x: 0, y: 10, z: -4.5}

36
Assets/Scenes/GameScene.unity
View File

@ -2002,7 +2002,7 @@ PrefabInstance:
m_Modifications:
- target: {fileID: 1023590545195096446, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3}
propertyPath: place
value: 8
value: 7
objectReference: {fileID: 0}
- target: {fileID: 3948338302074099163, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3}
propertyPath: m_Pivot.x
@ -4382,7 +4382,7 @@ PrefabInstance:
m_Modifications:
- target: {fileID: 1023590545195096446, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3}
propertyPath: place
value: 8
value: 7
objectReference: {fileID: 0}
- target: {fileID: 3948338302074099163, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3}
propertyPath: m_Pivot.x
@ -6208,7 +6208,7 @@ PrefabInstance:
m_Modifications:
- target: {fileID: 1023590545195096446, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3}
propertyPath: place
value: 8
value: 7
objectReference: {fileID: 0}
- target: {fileID: 3948338302074099163, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3}
propertyPath: m_Pivot.x
@ -7797,7 +7797,7 @@ PrefabInstance:
m_Modifications:
- target: {fileID: 1023590545195096446, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3}
propertyPath: place
value: 8
value: 7
objectReference: {fileID: 0}
- target: {fileID: 3948338302074099163, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3}
propertyPath: m_Pivot.x
@ -9455,7 +9455,7 @@ PrefabInstance:
m_Modifications:
- target: {fileID: 1023590545195096446, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3}
propertyPath: place
value: 8
value: 7
objectReference: {fileID: 0}
- target: {fileID: 3948338302074099163, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3}
propertyPath: m_Pivot.x
@ -10983,7 +10983,7 @@ PrefabInstance:
m_Modifications:
- target: {fileID: 1023590545195096446, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3}
propertyPath: place
value: 8
value: 7
objectReference: {fileID: 0}
- target: {fileID: 3948338302074099163, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3}
propertyPath: m_Pivot.x
@ -16281,7 +16281,7 @@ PrefabInstance:
m_Modifications:
- target: {fileID: 1023590545195096446, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3}
propertyPath: place
value: 8
value: 7
objectReference: {fileID: 0}
- target: {fileID: 3948338302074099163, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3}
propertyPath: m_Pivot.x
@ -22389,7 +22389,7 @@ PrefabInstance:
m_Modifications:
- target: {fileID: 1023590545195096446, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3}
propertyPath: place
value: 8
value: 7
objectReference: {fileID: 0}
- target: {fileID: 3948338302074099163, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3}
propertyPath: m_Pivot.x
@ -23187,7 +23187,7 @@ PrefabInstance:
m_Modifications:
- target: {fileID: 1023590545195096446, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3}
propertyPath: place
value: 8
value: 7
objectReference: {fileID: 0}
- target: {fileID: 3948338302074099163, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3}
propertyPath: m_Pivot.x
@ -26261,7 +26261,7 @@ PrefabInstance:
m_Modifications:
- target: {fileID: 1023590545195096446, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3}
propertyPath: place
value: 8
value: 7
objectReference: {fileID: 0}
- target: {fileID: 3948338302074099163, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3}
propertyPath: m_Pivot.x
@ -26544,7 +26544,7 @@ PrefabInstance:
m_Modifications:
- target: {fileID: 1023590545195096446, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3}
propertyPath: place
value: 8
value: 7
objectReference: {fileID: 0}
- target: {fileID: 3948338302074099163, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3}
propertyPath: m_Pivot.x
@ -28136,7 +28136,7 @@ PrefabInstance:
m_Modifications:
- target: {fileID: 1023590545195096446, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3}
propertyPath: place
value: 8
value: 7
objectReference: {fileID: 0}
- target: {fileID: 3948338302074099163, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3}
propertyPath: m_Pivot.x
@ -30003,7 +30003,7 @@ PrefabInstance:
m_Modifications:
- target: {fileID: 1023590545195096446, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3}
propertyPath: place
value: 8
value: 7
objectReference: {fileID: 0}
- target: {fileID: 3948338302074099163, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3}
propertyPath: m_Pivot.x
@ -31695,7 +31695,7 @@ PrefabInstance:
m_Modifications:
- target: {fileID: 1023590545195096446, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3}
propertyPath: place
value: 8
value: 7
objectReference: {fileID: 0}
- target: {fileID: 3948338302074099163, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3}
propertyPath: m_Pivot.x
@ -33957,7 +33957,7 @@ PrefabInstance:
m_Modifications:
- target: {fileID: 1023590545195096446, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3}
propertyPath: place
value: 8
value: 7
objectReference: {fileID: 0}
- target: {fileID: 3948338302074099163, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3}
propertyPath: m_Pivot.x
@ -35353,7 +35353,7 @@ PrefabInstance:
m_Modifications:
- target: {fileID: 1023590545195096446, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3}
propertyPath: place
value: 8
value: 7
objectReference: {fileID: 0}
- target: {fileID: 3948338302074099163, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3}
propertyPath: m_Pivot.x
@ -35618,7 +35618,7 @@ PrefabInstance:
m_Modifications:
- target: {fileID: 1023590545195096446, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3}
propertyPath: place
value: 8
value: 7
objectReference: {fileID: 0}
- target: {fileID: 3948338302074099163, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3}
propertyPath: m_Pivot.x
@ -36485,7 +36485,7 @@ PrefabInstance:
m_Modifications:
- target: {fileID: 1023590545195096446, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3}
propertyPath: place
value: 8
value: 7
objectReference: {fileID: 0}
- target: {fileID: 3948338302074099163, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3}
propertyPath: m_Pivot.x

2
Assets/Scripts/Handler/UIHandler.cs
View File

@ -63,7 +63,7 @@ namespace Assets.Scripts
{
tiletype = tiletype.Replace("Tile", "");
}
coordinates.GetComponent<Text>().text = TextHandler.getText(tiletype) + "(" + (int)position.x + "/" + (int)position.y + "/" + (int)position.z + ")";
coordinates.GetComponent<Text>().text = TextHandler.getText(tiletype.ToLower()) + "(" + (int)position.x + "/" + (int)position.y + "/" + (int)position.z + ")";
}
private void switchWaterLayer()

2
Assets/Scripts/Inventory.cs
View File

@ -276,7 +276,7 @@ namespace Assets.Scripts
{
result = result + "\"" + slotname + "\": \"empty\"";
}
if (i != 7)
if (i != 6)
{
result = result + ",\r\n";
}

84
Assets/Scripts/Player/PlayerGameObject.cs
View File

@ -40,7 +40,7 @@ namespace Assets.Scripts.Player
if (GameObject.Find("Inventory") != null)
{
inventory = GameObject.Find("Inventory").GetComponent<Inventory>();
inventory = GameObject.Find("Inventory").GetComponent<Inventory>();
}
if (GameObject.Find("WorldGenerator") != null)
{
@ -77,8 +77,8 @@ namespace Assets.Scripts.Player
if (now.AddSeconds(10).CompareTo(DateTime.Now) <= 0)
{
now = DateTime.Now;
player.regainSecondary(inventory.getEquipmentBonus()["MPR"],inventory.getEquipmentBonus()["MP"]);
player.healPlayer(inventory.getEquipmentBonus()["HPR"],inventory.getEquipmentBonus()["HP"]);
player.regainSecondary(inventory.getEquipmentBonus()["MPR"], inventory.getEquipmentBonus()["MP"]);
player.healPlayer(inventory.getEquipmentBonus()["HPR"], inventory.getEquipmentBonus()["HP"]);
}
}
}
@ -128,7 +128,8 @@ namespace Assets.Scripts.Player
player = new PlayerObject(playername, race, role, difficulty);
}
public void generatePlayer(BasicRace playerRace, BasicClass playerClass, string name, int difficulty){
public void generatePlayer(BasicRace playerRace, BasicClass playerClass, string name, int difficulty)
{
player = new PlayerObject(name, playerRace, playerClass, difficulty);
}
@ -213,35 +214,20 @@ namespace Assets.Scripts.Player
}
void OnTriggerEnter(Collider col)
{
if (col.gameObject.name.Contains("_"))
if (col.name.Contains("_"))
{
worldGenerator.changeCurrentTile(col.gameObject);
}
}
void OnTriggerStay(Collider col)
{
if (col.gameObject.name.Contains("border"))
{
Vector3 newTile = new Vector3();
if (col.gameObject.name.ToLower() == "bordernorth")
{
newTile = newTile + new Vector3(0, 0, 1);
}
if (col.gameObject.name.ToLower() == "bordersouth")
{
newTile = newTile + new Vector3(0, 0, -1);
}
if (col.gameObject.name.ToLower() == "bordereast")
{
newTile = newTile + new Vector3(1, 0, 0);
}
if (col.gameObject.name.ToLower() == "borderwest")
{
newTile = newTile + new Vector3(-1, 0, 0);
}
worldGenerator.createTile(newTile);
worldGenerator.createTile(new Vector3(-1,0,-1));
worldGenerator.createTile(new Vector3(0,0,-1));
worldGenerator.createTile(new Vector3(1,0,-1));
worldGenerator.createTile(new Vector3(-1,0,0));
worldGenerator.createTile(new Vector3(1,0,0));
worldGenerator.createTile(new Vector3(-1,0,1));
worldGenerator.createTile(new Vector3(0,0,1));
worldGenerator.createTile(new Vector3(1,0,1));
}
}
public void displayAction(int index, GameObject image, GameObject desc)
@ -316,51 +302,63 @@ namespace Assets.Scripts.Player
}
}
public PlayerStat getPlayerStat(string identifier){
public PlayerStat getPlayerStat(string identifier)
{
return player.getStat(identifier);
}
public void loadPlayer(JToken json){
public void loadPlayer(JToken json)
{
player = new PlayerObject();
player.loadPlayer(json);
}
public PlayerObject getPlayer(){
public PlayerObject getPlayer()
{
return player;
}
public string saveGame(){
public string saveGame()
{
return player.saveGame();
}
public BasicClass getClass(){
public BasicClass getClass()
{
return player.getClass();
}
public BasicRace getRace(){
public BasicRace getRace()
{
return player.getRace();
}
public int calculateDamage(){
public int calculateDamage()
{
return player.calculateDamage(inventory.getEquipmentBonus()["STR"], inventory.getEquipmentBonus()["DEX"]);
}
public bool takeDamage(int amount){
if(player != null){
return player.takeDamage(amount,inventory.getEquipmentBonus()["DEX"], inventory.getEquipmentBonus()["INT"]);
public bool takeDamage(int amount)
{
if (player != null)
{
return player.takeDamage(amount, inventory.getEquipmentBonus()["DEX"], inventory.getEquipmentBonus()["INT"]);
}
return false;
}
public int castSkill(int skillnumber){
return player.castSkill(skillnumber,inventory.getEquipmentBonus()["INT"], inventory.getEquipmentBonus()["STR"], inventory.getEquipmentBonus()["DEX"]);
public int castSkill(int skillnumber)
{
return player.castSkill(skillnumber, inventory.getEquipmentBonus()["INT"], inventory.getEquipmentBonus()["STR"], inventory.getEquipmentBonus()["DEX"]);
}
public void reduceCooldown(int skillnumber){
public void reduceCooldown(int skillnumber)
{
player.reduceCooldown(skillnumber);
}
public void regainSecondary(){
public void regainSecondary()
{
player.regainSecondary(inventory.getEquipmentBonus()["MPR"], inventory.getEquipmentBonus()["MP"]);
}
}

1
Assets/Scripts/Tile.cs
View File

@ -91,6 +91,7 @@ public class Tile : MonoBehaviour
string result = "{\r\n";
GameObject obj;
result = result + FileHandler.generateJSON("tiletype", "\"" + tiletype + "\"") + ",\r\n";
result = result + FileHandler.generateJSON("tilename", "\"" + name + "\"") + ",\r\n";
result = result + FileHandler.generateJSON("position", "\"" + position.x + "/" + position.y + "/" + position.z + "\"") + ",\r\n";
result = result + "\"objects\": {\r\n";
for (int i = 0; i < gameObject.transform.childCount; i++)

48
Assets/Scripts/WorldGenerator.cs
View File

@ -22,14 +22,13 @@ public class WorldGenerator : MonoBehaviour
// Start is called before the first frame update
void Start()
{
createSpawn();
}
private void OnEnable()
{
tiles = new Dictionary<Vector3, GameObject>();
noise = new NoiseGenerator();
createSpawn();
cityAmount = 10;
maxCityAmount = 10;
}
@ -72,13 +71,17 @@ public class WorldGenerator : MonoBehaviour
public void createSpawn()
{
Vector3 pos = new Vector3(0, 0, 0);
Vector3 mapPos = new Vector3(pos.x * 100, 0, pos.z * 100);
GameObject newTile = Instantiate(tile, mapPos, Quaternion.identity);
noise.applyNoise(newTile, tiles, pos);
newTile.GetComponent<Tile>().generateTile(pos, (TileType)Enum.Parse(typeof(TileType), newTile.name.Split("_")[0]));
tiles.Add(pos, newTile);
currentTile = newTile;
if (!tiles.ContainsKey(new Vector3(0, 0, 0)))
{
Vector3 pos = new Vector3(0, 0, 0);
Vector3 mapPos = new Vector3(pos.x * 100, 0, pos.z * 100);
GameObject newTile = Instantiate(tile, mapPos, Quaternion.identity);
noise.applyNoise(newTile, tiles, pos);
newTile.GetComponent<Tile>().generateTile(pos, (TileType)Enum.Parse(typeof(TileType), newTile.name.Split("_")[0]));
tiles.Add(pos, newTile);
currentTile = newTile;
}
}
public void createTile(Vector3 requiredPosition)
@ -92,7 +95,7 @@ public class WorldGenerator : MonoBehaviour
noise.applyNoise(newTile, tiles, pos);
newTile.GetComponent<Tile>().generateTile(pos, (TileType)Enum.Parse(typeof(TileType), newTile.name.Split("_")[0]));
tiles.Add(pos, newTile);
currentTile = newTile;
//currentTile = newTile;
GameObject.Find("QuestLog").GetComponent<QuestLog>().updateQuests("find", newTile, 1);
}
}
@ -121,15 +124,8 @@ public class WorldGenerator : MonoBehaviour
savePath = "./save/tile" + counter + ".json";
result = result + "\"tile" + counter + "\": \"" + savePath + "\"";
tile.GetComponent<Tile>().saveTile(savePath);
if (tile.GetComponent<Tile>().getTileType() == TileType.CITY)
{
FileHandler.saveNoise("\r\n}", savePath);
}
else
{
noise.saveTile(tile, savePath);
}
if (counter < tiles.Count - 2)
noise.saveTile(tile, savePath);
if (counter < tiles.Count - 1)
{
result = result + ",\r\n";
}
@ -155,16 +151,10 @@ public class WorldGenerator : MonoBehaviour
vectorParts = jsonData["position"].ToString().Split('/');
pos = new Vector3(float.Parse(vectorParts[0]), float.Parse(vectorParts[1]), float.Parse(vectorParts[2]));
mapPos = new Vector3(pos.x * 100, 0, pos.z * 100);
if (jsonData["tiletype"].ToString() == "CityTile")
{
loadedTile = Instantiate(tile, mapPos, Quaternion.identity);
}
else
{
loadedTile = Instantiate(tile, mapPos, Quaternion.identity);
loadedTile.GetComponent<Tile>().loadTile(jsonData, pos);
noise.loadTile(loadedTile, jsonData["vertices"], jsonData["colors"]);
}
loadedTile = Instantiate(tile, mapPos, Quaternion.identity);
loadedTile.GetComponent<Tile>().loadTile(jsonData, pos);
noise.loadTile(loadedTile, jsonData["vertices"], jsonData["colors"]);
loadedTile.name = jsonData["tilename"].ToString();
tiles.Add(pos, loadedTile);
}
currentTile = tiles[current];

96
save.json
View File

@ -3,8 +3,8 @@
"playername": "",
"maxHealth": 110,
"maxSecondary": 10,
"secondary": 50,
"health": 310,
"secondary": 10,
"health": 110,
"strength": 7,
"dexterity": 5,
"intelligence": 3,
@ -17,16 +17,27 @@
"healthRegen": 30,
"secondaryRegen": 5,
"isDodging": "False",
"killcount": -1,
"killcount": 0,
"luck": 20,
"difficulty": 0
},
"world": {
"cityAmount": 5,
"maxCityAmount": 5,
"currentTile": "0/0/0",
"currentTile": "-1/0/0",
"map": {
"tile0": "./save/tile0.json"
"tile0": "./save/tile0.json",
"tile1": "./save/tile1.json",
"tile2": "./save/tile2.json",
"tile3": "./save/tile3.json",
"tile4": "./save/tile4.json",
"tile5": "./save/tile5.json",
"tile6": "./save/tile6.json",
"tile7": "./save/tile7.json",
"tile8": "./save/tile8.json",
"tile9": "./save/tile9.json",
"tile10": "./save/tile10.json",
"tile11": "./save/tile11.json"
}
},
"inventory": {
@ -37,63 +48,98 @@
"amulet": "empty",
"feet": "empty",
"chest": "empty",
"ring": "empty",
"ring": "empty"
},
"bags": {
"slot0": {
"bag1": "empty",
"bag2": "empty",
"bag3": "empty"
},
"slot1": {
"bag1": "empty",
"bag2": "empty",
"bag3": "empty"
},
"slot2": {
"bag1": "empty",
"bag2": "empty",
"bag3": "empty"
},
"slot3": {
"bag1": "empty",
"bag2": "empty",
"bag3": "empty"
},
"slot4": {
"bag1": "empty",
"bag2": "empty",
"bag3": "empty"
},
"slot5": {
"bag1": "empty",
"bag2": "empty",
"bag3": "empty"
},
"slot6": {
"bag1": "empty",
"bag2": "empty",
"bag3": "empty"
},
"slot7": {
"bag1": "empty",
"bag2": "empty",
"bag3": "empty"
},
"slot8": {
"bag1": "empty",
"bag2": "empty",
"bag3": "empty"
},
"slot9": {
"bag1": "empty",
"bag2": "empty",
"bag3": "empty"
},
"slot10": {
"bag1": "empty",
"bag2": "empty",
"bag3": "empty"
},
"slot11": {
"bag1": "empty",
"bag2": "empty",
"bag3": "empty"
},
"slot12": {
"bag1": "empty",
"bag2": "empty",
"bag3": "empty"
},
"slot13": {
"bag1": "empty",
"bag2": "empty",
"bag3": "empty"
},
"slot14": {
"bag1": "empty",
"bag2": "empty",
"bag3": "empty"
},
"slot15": {
"bag1": "empty",
"bag2": "empty",
"bag3": "empty"
},
"slot16": {
"bag1": "empty",
"bag2": "empty",
"bag3": "empty"
},
"slot17": {
"bag1": "empty",
"bag2": "empty",
"bag3": "empty"
}
}
},