Almost done

natan-dot-com · Jan 8, 2022 · d517b2c · d517b2c
1 parent 886ce1c
commit d517b2c
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 30 deletions.
diff --git a/TalesOfLieselReborn.pro b/TalesOfLieselReborn.pro
@@ -1,4 +1,4 @@
-QT       += core gui
+QT       += core gui multimedia
 
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 

diff --git a/TalesOfLieselReborn.pro.user b/TalesOfLieselReborn.pro.user
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 5.0.3, 2022-01-07T14:25:47. -->
+<!-- Written by QtCreator 5.0.3, 2022-01-07T20:53:30. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>
@@ -85,6 +85,9 @@
     <valuelist type="QVariantList" key="ClangTools.SuppressedDiagnostics"/>
     <value type="bool" key="ClangTools.UseGlobalSettings">true</value>
    </valuemap>
+   <valuemap type="QVariantMap" key="CppEditor.QuickFix">
+    <value type="bool" key="UseGlobalSettings">true</value>
+   </valuemap>
   </valuemap>
  </data>
  <data>
@@ -94,13 +97,13 @@
    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop Qt 6.2.1 MinGW 64-bit</value>
    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop Qt 6.2.1 MinGW 64-bit</value>
    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">qt.qt6.621.win64_mingw81_kit</value>
-   <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">1</value>
+   <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
    <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
    <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
    <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
     <value type="int" key="EnableQmlDebugging">0</value>
-    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">C:\Users\grid\Documents\QtProjects\build-TalesOfLieselReborn-Desktop_Qt_6_2_1_MinGW_64_bit-Debug</value>
-    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">C:/Users/grid/Documents/QtProjects/build-TalesOfLieselReborn-Desktop_Qt_6_2_1_MinGW_64_bit-Debug</value>
+    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">C:\Users\grid\Documents\GitHub\build-TalesOfLieselReborn-Desktop_Qt_6_2_1_MinGW_64_bit-Debug</value>
+    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">C:/Users/grid/Documents/GitHub/build-TalesOfLieselReborn-Desktop_Qt_6_2_1_MinGW_64_bit-Debug</value>
     <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
      <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
       <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
@@ -137,8 +140,8 @@
     <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">2</value>
    </valuemap>
    <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1">
-    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">C:/Users/grid/Documents/GitHub/build-tales-of-liesel-Desktop_Qt_6_2_1_MinGW_64_bit-Release</value>
-    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">C:/Users/grid/Documents/GitHub/build-tales-of-liesel-Desktop_Qt_6_2_1_MinGW_64_bit-Release</value>
+    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">C:\Users\grid\Documents\GitHub\build-TalesOfLieselReborn-Desktop_Qt_6_2_1_MinGW_64_bit-Release</value>
+    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">C:/Users/grid/Documents/GitHub/build-TalesOfLieselReborn-Desktop_Qt_6_2_1_MinGW_64_bit-Release</value>
     <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
      <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
       <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
@@ -177,8 +180,8 @@
    </valuemap>
    <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.2">
     <value type="int" key="EnableQmlDebugging">0</value>
-    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">C:\Users\grid\Documents\QtProjects\build-TalesOfLieselReborn-Desktop_Qt_6_2_1_MinGW_64_bit-Profile</value>
-    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">C:/Users/grid/Documents/QtProjects/build-TalesOfLieselReborn-Desktop_Qt_6_2_1_MinGW_64_bit-Profile</value>
+    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">C:\Users\grid\Documents\GitHub\build-TalesOfLieselReborn-Desktop_Qt_6_2_1_MinGW_64_bit-Profile</value>
+    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">C:/Users/grid/Documents/GitHub/build-TalesOfLieselReborn-Desktop_Qt_6_2_1_MinGW_64_bit-Profile</value>
     <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
      <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
       <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
@@ -237,15 +240,14 @@
     <valuelist type="QVariantList" key="CustomOutputParsers"/>
     <value type="int" key="PE.EnvironmentAspect.Base">2</value>
     <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">TalesOfLieselReborn2</value>
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:C:/Users/grid/Documents/GitHub/TalesOfLiesel/TalesOfLieselReborn.pro</value>
     <value type="QString" key="ProjectExplorer.RunConfiguration.BuildKey">C:/Users/grid/Documents/GitHub/TalesOfLiesel/TalesOfLieselReborn.pro</value>
     <value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
     <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
     <value type="bool" key="RunConfiguration.UseLibrarySearchPath">true</value>
     <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
     <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
-    <value type="QString" key="RunConfiguration.WorkingDirectory.default">C:/Users/grid/Documents/GitHub/build-tales-of-liesel-Desktop_Qt_6_2_1_MinGW_64_bit-Release</value>
+    <value type="QString" key="RunConfiguration.WorkingDirectory.default">C:/Users/grid/Documents/GitHub/build-TalesOfLieselReborn-Desktop_Qt_6_2_1_MinGW_64_bit-Debug</value>
    </valuemap>
    <value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value>
   </valuemap>

diff --git a/assets.qrc b/assets.qrc
@@ -84,4 +84,11 @@
         <file>src/assets/enemies/enemies_full/wolf-4v2.png</file>
         <file>src/assets/background-menu.png</file>
     </qresource>
+    <qresource prefix="/music">
+        <file>music/0-tavern.mp3</file>
+        <file>music/1-highland.mp3</file>
+        <file>music/2-streets-of-plague.mp3</file>
+        <file>music/3-battle-of-the-creek.mp3</file>
+        <file>music/4-medieval.mp3</file>
+    </qresource>
 </RCC>
diff --git a/lib/backend/liesel.h b/lib/backend/liesel.h
@@ -18,7 +18,6 @@ class Liesel : private Rng {
 	// Main character skills
 	Fireball fireSkill;
 	DestructionAura destructionSkill;
-	Chronomancy chronoSkill;
 
 	Liesel();
 	bool updateExp(int gainedExp);

diff --git a/lib/backend/skills.h b/lib/backend/skills.h
@@ -25,11 +25,6 @@ class Fireball : public Skill {
 	double skillEffect();
 };
 
-class Chronomancy : public Skill {
-public:
-	double skillEffect();
-};
-
 class DestructionAura : public Skill {
 private:
 	double skillEffect();

diff --git a/lib/game.h b/lib/game.h
@@ -100,7 +100,6 @@ public slots:
 
     // Skills management
     bool updateFireball();
-    bool updateChronomancy();
     bool updateDestructionAura();
 
     // Floor management

diff --git a/src/backend/ctx.cpp b/src/backend/ctx.cpp
@@ -179,12 +179,6 @@ bool Context::updateFireball() {
 	return this->playerInstance->fireSkill.updateExp(currSoulCoins);
 }
 
-bool Context::updateChronomancy() {
-	const int currSoulCoins = this->playerInstance->getSoulCoins();
-	this->playerInstance->updateSpentCoins(currSoulCoins);
-	return this->playerInstance->chronoSkill.updateExp(currSoulCoins);
-}
-
 bool Context::updateDestructionAura() {
 	const int currSoulCoins = this->playerInstance->getSoulCoins();
 	this->playerInstance->updateSpentCoins(currSoulCoins);

diff --git a/src/game.cpp b/src/game.cpp
@@ -221,12 +221,6 @@ bool Game::updateFireball() {
     return result;
 }
 
-bool Game::updateChronomancy() {
-    const int currSoulCoins = this->playerInstance->getSoulCoins();
-    this->playerInstance->updateSpentCoins(currSoulCoins);
-    return this->playerInstance->chronoSkill.updateExp(currSoulCoins);
-}
-
 bool Game::updateDestructionAura() {
     const int currSoulCoins = this->playerInstance->getSoulCoins();
     this->playerInstance->updateSpentCoins(currSoulCoins);