Added controls for gamepad, changed input & UI

This commit is contained in:
TAASONI3
2023-07-04 20:15:06 +02:00
parent 0b058f9248
commit 7aba856b17
48 changed files with 24176 additions and 15427 deletions

View File

@@ -12,6 +12,7 @@ namespace Assets.Scripts
Player player;
AudioHandler audioHandler;
WorldGenerator worldGenerator;
GameObject fight;
private void Start()
{
@@ -19,6 +20,7 @@ namespace Assets.Scripts
player = GameObject.Find("Player").GetComponent<Player>();
worldGenerator = GameObject.Find("WorldGenerator").GetComponent<WorldGenerator>();
audioHandler = GameObject.Find("AudioHandler").GetComponent<AudioHandler>();
fight = GameObject.Find("Fight");
}
public void openOptions()
@@ -49,35 +51,30 @@ namespace Assets.Scripts
{
audioHandler.playButtonClick();
player.upgradeStrength();
EventSystem.current.SetSelectedGameObject(null);
}
public void upgradeDexterity()
{
audioHandler.playButtonClick();
player.upgradeDexterity();
EventSystem.current.SetSelectedGameObject(null);
}
public void upgradeIntelligence()
{
audioHandler.playButtonClick();
player.upgradeIntelligence();
EventSystem.current.SetSelectedGameObject(null);
}
public void upgradeHealth()
{
audioHandler.playButtonClick();
player.upgradeHealth();
EventSystem.current.SetSelectedGameObject(null);
}
public void upgradeSecondary()
{
audioHandler.playButtonClick();
player.upgradeSecondary();
EventSystem.current.SetSelectedGameObject(null);
}
public void saveOptions()
@@ -86,8 +83,10 @@ namespace Assets.Scripts
audioHandler.playButtonClick();
saveText = saveText + uihandler.saveVideoSettings() + "\r\n";
saveText = saveText + audioHandler.saveAudioSettings() + "\r\n";
GameObject.Find("Main Camera").GetComponent<PlayerCamera>().speed = GameObject.Find("slideSensitivity").GetComponent<Slider>().value;
saveText = saveText + "Sensitivity:"+GameObject.Find("slideSensitivity").GetComponent<Slider>().value;
GameObject.Find("Main Camera").GetComponent<PlayerCamera>().mouseSpeed = GameObject.Find("slideSensitivityMouse").GetComponent<Slider>().value;
GameObject.Find("Main Camera").GetComponent<PlayerCamera>().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;
FileHandler.saveOptions(saveText);
uihandler.closeOptions();
}
@@ -96,7 +95,6 @@ namespace Assets.Scripts
{
audioHandler.playButtonClick();
uihandler.startGame();
EventSystem.current.SetSelectedGameObject(null);
}
public void switchCharactersheet()
@@ -135,5 +133,17 @@ namespace Assets.Scripts
saveString = saveString + "\r\n}";
FileHandler.saveGame(saveString, "./save.json");
}
public void castSkill(int index){
fight.GetComponent<Fight>().playerAction(index);
}
public void switchOptionView(string key){
uihandler.showOptionView(key);
}
public void closeTutorial(){
uihandler.closeTutorial();
}
}
}