Merge pull request #293 from SuperV1234/sound_update

The Sound Update
vittorioromeo · Sep 19, 2020 · a58375c · a58375c
2 parents cc0aea6 + 7173f69
commit a58375c
Show file tree

Hide file tree

Showing 12 changed files with 21 additions and 9 deletions.
diff --git a/_RELEASE/Assets/Open Hexagon Assets License.txt b/_RELEASE/Assets/Open Hexagon Assets License.txt
@@ -0,0 +1,9 @@
+OPEN HEXAGON SOUND LICENSE | © 2020 LukeMans (https://lukemans.carrd.co/)
+
+The sound effects beep.ogg, death.ogg, error.ogg, increment.ogg, restart.ogg, select.ogg, and swap.ogg
+are created by Luuk Zellenrath (known as LukeMans) and hereby grants irrevokable rights of the sounds 
+to be used for the game Open Hexagon. The sounds listed shall only be used by Open Hexagon, and cannot 
+be used in commercial content, including but not limited to, games, videos, music, etc. These sound 
+effects are allowed on video streaming sites, including but not limited to YouTube, Twitch, etc. under 
+17 U.S. Code § 107. Reuploads of the sound effects are prohibited and will be requested to be taken 
+down. 
diff --git a/_RELEASE/Assets/assets.json b/_RELEASE/Assets/assets.json
@@ -22,11 +22,14 @@
 	[
 		"beep.ogg",
 		"death.ogg",
+		"error.ogg",
 		"gameOver.ogg",
 		"go.ogg",
+		"increment.ogg",
 		"levelUp.ogg",
 		"openHexagon.ogg",
-		"error.ogg",
+		"restart.ogg",
+		"select.ogg",
 		"swap.ogg"
 	]
 }
diff --git a/_RELEASE/Assets/beep.ogg b/_RELEASE/Assets/beep.ogg
diff --git a/_RELEASE/Assets/death.ogg b/_RELEASE/Assets/death.ogg
diff --git a/_RELEASE/Assets/error.ogg b/_RELEASE/Assets/error.ogg
diff --git a/_RELEASE/Assets/increment.ogg b/_RELEASE/Assets/increment.ogg
diff --git a/_RELEASE/Assets/restart.ogg b/_RELEASE/Assets/restart.ogg
diff --git a/_RELEASE/Assets/select.ogg b/_RELEASE/Assets/select.ogg
diff --git a/_RELEASE/Assets/swap.ogg b/_RELEASE/Assets/swap.ogg
diff --git a/src/SSVOpenHexagon/Core/HexagonDialogBox.cpp b/src/SSVOpenHexagon/Core/HexagonDialogBox.cpp
@@ -119,7 +119,7 @@ void HexagonDialogBox::drawDialogBox()
 
 void HexagonDialogBox::clearDialogBox()
 {
-    assets.playSound("beep.ogg");
+    assets.playSound("select.ogg");
     dialogFrame.clear();
     dialogText.clear();
 }

diff --git a/src/SSVOpenHexagon/Core/HexagonGame.cpp b/src/SSVOpenHexagon/Core/HexagonGame.cpp
@@ -371,6 +371,9 @@ void HexagonGame::newGame(const std::string& mPackId, const std::string& mId,
     if(!firstPlay)
     {
         runLuaFunction<void>("onUnload");
+        assets.playSound("restart.ogg");
+    } else {
+        assets.playSound("select.ogg");
     }
 
     runLuaFunction<void>("onInit");
@@ -449,6 +452,7 @@ void HexagonGame::sideChange(unsigned int mSideNumber)
 
     mustChangeSides = false;
 
+    assets.playSound("increment.ogg");
     runLuaFunction<void>("onIncrement");
 }
 

diff --git a/src/SSVOpenHexagon/Core/MenuGame.cpp b/src/SSVOpenHexagon/Core/MenuGame.cpp
@@ -789,7 +789,7 @@ void MenuGame::downAction()
 }
 void MenuGame::okAction()
 {
-    assets.playSound("beep.ogg");
+    assets.playSound("select.ogg");
     touchDelay = 50.f;
 
     if(state == States::EpilepsyWarning)
@@ -947,8 +947,6 @@ void MenuGame::createProfileAction()
 
 void MenuGame::selectProfileAction()
 {
-    assets.playSound("beep.ogg");
-
     if(state != States::SMain)
     {
         return;
@@ -958,20 +956,18 @@ void MenuGame::selectProfileAction()
         state = States::MWlcm;
         return;
     }
-    assets.playSound("beep.ogg");
+    assets.playSound("select.ogg");
     enteredStr = "";
     state = States::SLPSelect;
 }
 
 void MenuGame::openOptionsAction()
 {
-    assets.playSound("beep.ogg");
-
     if(state != States::SMain)
     {
         return;
     }
-    assets.playSound("beep.ogg");
+    assets.playSound("select.ogg");
     state = States::MOpts;
 }