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

Worked on UI and translation, worked on classes and races, worked on camera

Browse Source
This commit is contained in:
TAASONI3
2024-06-30 20:00:34 +02:00
parent cbd086d658
commit 80e11d3ce0
33 changed files with 3415 additions and 860 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1316,6 +1316,46 @@ MonoBehaviour:
m_Key: normal
m_Metadata:
m_Items: []
- m_Id: 131154097316855808
m_Key: MenuScene/Canvas/CharacterCreation/pnlInput/dropClass 3
m_Metadata:
m_Items: []
- m_Id: 131154206477811712
m_Key: MenuScene/Canvas/CharacterCreation/pnlInput/dropRace 5
m_Metadata:
m_Items: []
- m_Id: 131155414772908032
m_Key: nightelf
m_Metadata:
m_Items: []
- m_Id: 131155416651956224
m_Key: druid
m_Metadata:
m_Items: []
- m_Id: 131163838982160384
m_Key: horizontal
m_Metadata:
m_Items: []
- m_Id: 131163841704263680
m_Key: vertical
m_Metadata:
m_Items: []
- m_Id: 131170344725151744
m_Key: MenuScene/Canvas/Options/Settings/pnlContent/pnlControlsKeyboard/txtSensitivityMouse_2
m_Metadata:
m_Items: []
- m_Id: 131170584358322176
m_Key: GameScene/Canvas/Options/Settings/pnlContent/pnlControlsKeyboard/txtSensitivityMouse_2
m_Metadata:
m_Items: []
- m_Id: 131171548708503552
m_Key: MenuScene/Canvas/Options/Settings/pnlContent/pnlControlsController/txtSensitivityController_2
m_Metadata:
m_Items: []
- m_Id: 131171550805655552
m_Key: GameScene/Canvas/Options/Settings/pnlContent/pnlControlsController/txtSensitivityController_2
m_Metadata:
m_Items: []
m_Metadata:
m_Items: []
m_KeyGenerator:

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

@@ -663,11 +663,11 @@ MonoBehaviour:
m_Metadata:
m_Items: []
- m_Id: 204708862750720
m_Localized: 'Empfindlichkeit:'
m_Localized: 'Empfindlichkeit Horizontal:'
m_Metadata:
m_Items: []
- m_Id: 204732065640448
m_Localized: 'Empfindlichkeit:'
m_Localized: 'Empfindlichkeit Horizontal:'
m_Metadata:
m_Items: []
- m_Id: 204761731952640
@@ -928,11 +928,11 @@ MonoBehaviour:
m_Metadata:
m_Items: []
- m_Id: 207547915825152
m_Localized: 'Empfindlichkeit:'
m_Localized: 'Empfindlichkeit Horizontal:'
m_Metadata:
m_Items: []
- m_Id: 207592409001984
m_Localized: 'Empfindlichkeit:'
m_Localized: 'Empfindlichkeit Horizontal:'
m_Metadata:
m_Items: []
- m_Id: 207625044881408
@@ -1325,6 +1325,46 @@ MonoBehaviour:
m_Localized: ' '
m_Metadata:
m_Items: []
- m_Id: 131154097316855808
m_Localized: Druide
m_Metadata:
m_Items: []
- m_Id: 131154206477811712
m_Localized: Nachtelf
m_Metadata:
m_Items: []
- m_Id: 131155414772908032
m_Localized: Nachtelf
m_Metadata:
m_Items: []
- m_Id: 131155416651956224
m_Localized: Druide
m_Metadata:
m_Items: []
- m_Id: 131163838982160384
m_Localized: Horizontal
m_Metadata:
m_Items: []
- m_Id: 131163841704263680
m_Localized: Vertikal
m_Metadata:
m_Items: []
- m_Id: 131170344725151744
m_Localized: 'Empfindlichkeit Vertikal:'
m_Metadata:
m_Items: []
- m_Id: 131170584358322176
m_Localized: 'Empfindlichkeit Vertikal:'
m_Metadata:
m_Items: []
- m_Id: 131171548708503552
m_Localized: 'Empfindlichkeit Vertikal:'
m_Metadata:
m_Items: []
- m_Id: 131171550805655552
m_Localized: 'Empfindlichkeit Vertikal:'
m_Metadata:
m_Items: []
references:
version: 2
RefIds: []

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

@@ -686,11 +686,11 @@ MonoBehaviour:
m_Metadata:
m_Items: []
- m_Id: 204708862750720
m_Localized: 'Sensitivity:'
m_Localized: 'Sensitivity Horizontal:'
m_Metadata:
m_Items: []
- m_Id: 204732065640448
m_Localized: 'Sensitivity:'
m_Localized: 'Sensitivity Horizontal:'
m_Metadata:
m_Items: []
- m_Id: 204761731952640
@@ -948,11 +948,11 @@ MonoBehaviour:
m_Metadata:
m_Items: []
- m_Id: 207547915825152
m_Localized: 'Sensitivity:'
m_Localized: 'Sensitivity Horizontal:'
m_Metadata:
m_Items: []
- m_Id: 207592409001984
m_Localized: 'Sensitivity:'
m_Localized: 'Sensitivity Horizontal:'
m_Metadata:
m_Items: []
- m_Id: 207625044881408
@@ -1368,6 +1368,46 @@ MonoBehaviour:
m_Localized: ' '
m_Metadata:
m_Items: []
- m_Id: 131154097316855808
m_Localized: Druid
m_Metadata:
m_Items: []
- m_Id: 131154206477811712
m_Localized: Nightelf
m_Metadata:
m_Items: []
- m_Id: 131155414772908032
m_Localized: Nightelf
m_Metadata:
m_Items: []
- m_Id: 131155416651956224
m_Localized: Druid
m_Metadata:
m_Items: []
- m_Id: 131163838982160384
m_Localized: horizontal
m_Metadata:
m_Items: []
- m_Id: 131163841704263680
m_Localized: vertical
m_Metadata:
m_Items: []
- m_Id: 131170344725151744
m_Localized: 'Sensitivity Vertical:'
m_Metadata:
m_Items: []
- m_Id: 131170584358322176
m_Localized: 'Sensitivity Vertical:'
m_Metadata:
m_Items: []
- m_Id: 131171548708503552
m_Localized: 'Sensitivity Vertical:'
m_Metadata:
m_Items: []
- m_Id: 131171550805655552
m_Localized: 'Sensitivity Vertical:'
m_Metadata:
m_Items: []
references:
version: 2
RefIds: []

31
Assets/Resources/skillTree.json
View File

@@ -91,5 +91,36 @@
"skillAnimation":""
}
}
},
"Druid":{
"first":{
"first":{
"name":"Stab",
"baseDamage":"20",
"secondaryConsumption":"10",
"cooldown":"2",
"description":"Early skill to apply some damage.",
"skillIcon":"Skills/Thief/Stab",
"skillAnimation":""
},
"second":{
"name":"SmokeScreen",
"baseDamage":"0",
"secondaryConsumption":"5",
"cooldown":"1",
"description":"Hide from the next attack",
"skillIcon":"Skills/Thief/SmokeScreen",
"skillAnimation":""
},
"third":{
"name":"Heartstop",
"baseDamage":"35",
"secondaryConsumption":"30",
"cooldown":"4",
"description":"Stop the heart of your enemy. High damage.",
"skillIcon":"Skills/Thief/Heartstop",
"skillAnimation":""
}
}
}
}

1345
Assets/Scenes/GameScene.unity
View File

File diff suppressed because it is too large Load Diff

1071
Assets/Scenes/MenuScene.unity
View File

File diff suppressed because it is too large Load Diff

21
Assets/Scripts/Classes/DruidClass.cs Normal file
View File

@@ -0,0 +1,21 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
namespace Assets.Scripts.Classes
{
class DruidClass : BasicClass
{
public DruidClass() : base()
{
classname = "Druid";
dexterityBonus = 1;
intelligenceBonus = 1;
strengthBonus = -2;
healthBonus = -10;
secondaryBonus = 20;
leftHandName = "smallShield";
rightHandName = "wand";
}
}
}

11
Assets/Scripts/Classes/DruidClass.cs.meta Normal file
View File

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

13
Assets/Scripts/Controls.cs
View File

@@ -20,9 +20,10 @@ public class Controls : MonoBehaviour
PlayerInput playerInput;
MoveDirection direction;
public float mouseSpeed = 10f; //the sensibility
public float controllerSpeed = 1f; //the sensibility
public Vector2 sensitivityController = new Vector2(0,0);
public Vector2 sensitivityMouse = new Vector2(0,0);
float multiplier = 0.01f; //DEV Purpose only
void Start()
{
@@ -55,12 +56,12 @@ public class Controls : MonoBehaviour
if (uihandler.canPlayerRotate())
{
if(playerInput.currentControlScheme == "Controller"){
playerCam.GetComponent<PlayerCamera>().lookAround(view, controllerSpeed);
player.GetComponent<PlayerGameObject>().rotate(view, controllerSpeed);
playerCam.GetComponent<PlayerCamera>().lookAround(view, sensitivityController * multiplier);
player.GetComponent<PlayerGameObject>().rotate(view, sensitivityController * multiplier);
}
else{
playerCam.GetComponent<PlayerCamera>().lookAround(view, mouseSpeed);
player.GetComponent<PlayerGameObject>().rotate(view, mouseSpeed);
playerCam.GetComponent<PlayerCamera>().lookAround(view, sensitivityMouse * multiplier);
player.GetComponent<PlayerGameObject>().rotate(view, sensitivityMouse * multiplier);
}
}
if (uihandler.canPlayerMove())

14
Assets/Scripts/Handler/ButtonHandler.cs
View File

@@ -85,10 +85,16 @@ namespace Assets.Scripts
saveText = saveText + uihandler.saveVideoSettings() + "\r\n";
saveText = saveText + uihandler.saveLanguage() + "\r\n";
saveText = saveText + audioHandler.saveAudioSettings() + "\r\n";
GameObject.Find("Controls").GetComponent<Controls>().mouseSpeed = GameObject.Find("slideSensitivityMouse").GetComponent<Slider>().value;
GameObject.Find("Controls").GetComponent<Controls>().controllerSpeed = GameObject.Find("slideSensitivityController").GetComponent<Slider>().value;
saveText = saveText + "SensitivityMouse:"+GameObject.Find("slideSensitivityMouse").GetComponent<Slider>().value + "\r\n";
saveText = saveText + "SensitivityController:"+GameObject.Find("slideSensitivityController").GetComponent<Slider>().value;
GameObject.Find("Controls").GetComponent<Controls>().sensitivityMouse = new Vector2(
GameObject.Find("slideSensitivityMouseHorizontal").GetComponent<Slider>().value,
GameObject.Find("slideSensitivityMouseVertical").GetComponent<Slider>().value
);
GameObject.Find("Controls").GetComponent<Controls>().sensitivityController = new Vector2(
GameObject.Find("slideSensitivityControllerHorizontal").GetComponent<Slider>().value,
GameObject.Find("slideSensitivityControllerVertical").GetComponent<Slider>().value
);
saveText = saveText + "SensitivityController:"+GameObject.Find("slideSensitivityControllerHorizontal").GetComponent<Slider>().value + "/" + GameObject.Find("slideSensitivityControllerVertical").GetComponent<Slider>().value + "\r\n";
saveText = saveText + "SensitivityMouse:"+GameObject.Find("slideSensitivityMouseHorizontal").GetComponent<Slider>().value + "/" + GameObject.Find("slideSensitivityMouseVertical").GetComponent<Slider>().value;
FileHandler.saveOptions(saveText);
uihandler.closeOptions();
}

20
Assets/Scripts/Handler/FileHandler.cs
View File

@@ -59,8 +59,8 @@ namespace Assets.Scripts
sw.WriteLine("Resolution:1");
sw.WriteLine("Mode:0");
sw.WriteLine("Language:en");
sw.WriteLine("SensitivityMouse:1");
sw.WriteLine("SensitivityController:1");
sw.WriteLine("SensitivityMouse:1/1");
sw.WriteLine("SensitivityController:1/1");
sw.Flush();
sw.Close();
}
@@ -104,12 +104,18 @@ namespace Assets.Scripts
break;
case "SensitivityMouse":
if(isIngame){
GameObject.Find("Controls").GetComponent<Controls>().mouseSpeed = float.Parse(line.Split(':')[1]);
GameObject.Find("Controls").GetComponent<Controls>().sensitivityMouse = new Vector2(
float.Parse(line.Split(':')[1].Split("/")[0]),
float.Parse(line.Split(':')[1].Split("/")[1])
);
}
break;
case "SensitivityController":
if(isIngame){
GameObject.Find("Controls").GetComponent<Controls>().controllerSpeed = float.Parse(line.Split(':')[1]);
GameObject.Find("Controls").GetComponent<Controls>().sensitivityController = new Vector2(
float.Parse(line.Split(':')[1].Split("/")[0]),
float.Parse(line.Split(':')[1].Split("/")[1])
);
}
break;
}
@@ -136,10 +142,12 @@ namespace Assets.Scripts
GameObject.Find("dropLanguage").GetComponent<Dropdown>().value = line.Split(':')[1].Equals("en") ? 1 : 0;
break;
case "SensitivityMouse":
GameObject.Find("slideSensitivityMouse").GetComponent<Slider>().value = float.Parse(line.Split(':')[1]);
GameObject.Find("slideSensitivityMouseHorizontal").GetComponent<Slider>().value = float.Parse(line.Split(':')[1].Split("/")[0]);
GameObject.Find("slideSensitivityMouseVertical").GetComponent<Slider>().value = float.Parse(line.Split(':')[1].Split("/")[1]);
break;
case "SensitivityController":
GameObject.Find("slideSensitivityController").GetComponent<Slider>().value = float.Parse(line.Split(':')[1]);
GameObject.Find("slideSensitivityControllerHorizontal").GetComponent<Slider>().value = float.Parse(line.Split(':')[1].Split("/")[0]);
GameObject.Find("slideSensitivityControllerVertical").GetComponent<Slider>().value = float.Parse(line.Split(':')[1].Split("/")[1]);
break;
}
}

6
Assets/Scripts/Items/Equipment.cs
View File

@@ -90,6 +90,9 @@ namespace Assets.Scripts
case "Mage":
replacement = "Orb";
break;
case "Druid":
replacement = "Shield";
break;
}
}
else if (place == ItemPlace.RIGHTHAND)
@@ -105,6 +108,9 @@ namespace Assets.Scripts
case "Mage":
replacement = "Wand";
break;
case "Druid":
replacement = "Wand";
break;
}
}
if (itemName != null)

4
Assets/Scripts/Menu/ButtonHandlerMenu.cs
View File

@@ -71,8 +71,8 @@ namespace Assets.Scripts.Menu
saveText = saveText + uihandler.saveVideoSettings() + "\r\n";
saveText = saveText + uihandler.saveLanguage() + "\r\n";
saveText = saveText + audioHandler.saveAudioSettings() + "\r\n";
saveText = saveText + "SensitivityMouse:"+GameObject.Find("slideSensitivityMouse").GetComponent<Slider>().value + "\r\n";
saveText = saveText + "SensitivityController:"+GameObject.Find("slideSensitivityController").GetComponent<Slider>().value;
saveText = saveText + "SensitivityController:"+GameObject.Find("slideSensitivityControllerHorizontal").GetComponent<Slider>().value + "/" + GameObject.Find("slideSensitivityControllerVertical").GetComponent<Slider>().value + "\r\n";
saveText = saveText + "SensitivityMouse:"+GameObject.Find("slideSensitivityMouseHorizontal").GetComponent<Slider>().value + "/" + GameObject.Find("slideSensitivityMouseVertical").GetComponent<Slider>().value;
FileHandler.saveOptions(saveText);
uihandler.closeOptions();
}

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

@@ -73,6 +73,9 @@ namespace Assets.Scripts.Menu
case 2:
playerClass = new ThiefClass();
break;
case 3:
playerClass = new DruidClass();
break;
}
switch (race)
{
@@ -91,6 +94,9 @@ namespace Assets.Scripts.Menu
case 4:
playerRace = new GiantRace();
break;
case 5:
playerRace = new NightelfRace();
break;
}
GameObject.Find("Player").GetComponent<PlayerGameObject>().generatePlayer(playerRace, playerClass, name, GameObject.Find("dropDifficulty").GetComponent<Dropdown>().value);
}

4
Assets/Scripts/Player/PlayerCamera.cs
View File

@@ -43,10 +43,10 @@ namespace Assets.Scripts.Player
return null;
}
public void lookAround(Vector2 view, float speed)
public void lookAround(Vector2 view, Vector2 speed)
{
GameObject target = GameObject.Find("targetLooking");
target.transform.localPosition = target.transform.localPosition + new Vector3(0,view.y,0) * speed * Time.deltaTime;
target.transform.localPosition = target.transform.localPosition + new Vector3(0,view.y,0) * speed.x;// * Time.deltaTime;
if(target.transform.localPosition.y >= 2){
target.transform.localPosition = new Vector3(target.transform.localPosition.x,2f,target.transform.localPosition.z);
}

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

@@ -129,6 +129,9 @@ namespace Assets.Scripts.Player
case 2:
role = new ThiefClass();
break;
case 3:
role = new DruidClass();
break;
}
switch (PlayerPrefs.GetInt("race"))
{
@@ -147,6 +150,9 @@ namespace Assets.Scripts.Player
case 4:
race = new GiantRace();
break;
case 5:
race = new NightelfRace();
break;
}
string playername = PlayerPrefs.GetString("playername");
difficulty = PlayerPrefs.GetInt("difficulty");
@@ -180,15 +186,14 @@ namespace Assets.Scripts.Player
canJump = false;
}
}
Vector3 movement = new Vector3(0, 0, input.z);
Vector3 movement = new Vector3(input.x, 0, input.z);
gameObject.transform.Translate(movement * speed * Time.deltaTime);
gameObject.transform.Rotate(Vector3.up, input.x * 100 * Time.deltaTime);
gameObject.GetComponent<Animator>().SetFloat("velocity", (movement * speed).z);
GameObject.Find("QuestLog").GetComponent<QuestLog>().updateQuests("explore", gameObject, 1);
}
public void rotate(Vector2 input, float speed){
transform.Rotate(Vector3.up, input.x * speed * 10 * Time.deltaTime);
public void rotate(Vector2 input, Vector2 speed){
transform.Rotate(Vector3.up, input.x * speed.y);// * Time.deltaTime);
}
public void getRotation()

14
Assets/Scripts/Player/PlayerObject.cs
View File

@@ -89,6 +89,14 @@ namespace Assets.Scripts.Player
skills[2] = new BasicSkill(35, 30, 4, "Fireball", "Skills/Mage/Fireball", null);
skills[2].setDescription(TextHandler.getText("fireballDesc"));
break;
case "Druid":
skills[0] = new BasicSkill(20, 10, 2, "Stab", "Skills/Thief/Stab", null);
skills[0].setDescription(TextHandler.getText("stabDesc"));
skills[1] = new BasicSkill(0, 5, 1, "SmokeScreen", "Skills/Thief/SmokeScreen", null);
skills[1].setDescription(TextHandler.getText("smokeScreenDesc"));
skills[2] = new BasicSkill(35, 30, 4, "Heartstop", "Skills/Thief/Heartstop", null);
skills[2].setDescription(TextHandler.getText("heartStopDesc"));
break;
}
}
@@ -133,6 +141,9 @@ namespace Assets.Scripts.Player
case "Thief":
role = new ThiefClass();
break;
case "Driud":
role = new DruidClass();
break;
}
}
@@ -155,6 +166,9 @@ namespace Assets.Scripts.Player
case "Goblin":
race = new GoblinRace();
break;
case "Nightelf":
race = new NightelfRace();
break;
}
}

19
Assets/Scripts/Races/NightelfRace.cs Normal file
View File

@@ -0,0 +1,19 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
namespace Assets.Scripts.Races
{
class NightelfRace : BasicRace
{
public NightelfRace() : base()
{
racename = "Nightelf";
dexterityBonus = 2;
intelligenceBonus = 2;
strengthBonus = -2;
healthBonus = 0;
secondaryBonus = 10;
}
}
}

11
Assets/Scripts/Races/NightelfRace.cs.meta Normal file
View File

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