Fix invalid play.html file reference in emscripten_run.sh script. Update scripts to make sure packkey source file is always assumed unchanged. Fix typos.

.gitignore

@@ -397,10 +397,7 @@ build/CMakeFiles/3.16.3/CompilerIdC/CMakeCCompilerId.c
 build/CMakeFiles/3.16.3/CompilerIdCXX/CMakeCXXCompilerId.cpp
 test.cpp
 /Adventures in Lestoria/Adventures in Lestoria
-/Adventures in Lestoria/packkey.cpp
 /x64/Release/Adventures in Lestoria.zip
 /x64/Release/Adventures in Lestoria_web.zip
 /x64/Release/AdventuresInLestoria_web.zip
-Adventures in Lestoria/packkey.cpp
-Adventures in Lestoria/packkey.cpp
 packkey.cpp

Adventures in Lestoria/Adventures in Lestoria.html

@@ -35,7 +35,7 @@ var Module = {
     })(),
 };
         </script>
-        <script async type="text/javascript" src="Adventures in Lestoria.js"></script>
+        <script async type="text/javascript" src="AdventuresInLestoria.js"></script>
         <script type="text/javascript">
 Module.canvas.addEventListener("resize", (e) => {
 

Adventures in Lestoria/AdventuresInLestoria.cpp

@@ -434,6 +434,7 @@ void AiL::HandleUserInput(float fElapsedTime){
 		Menu::OpenMenu(MenuType::PAUSE);
 	}
 	float animationSpd=0.f;
+	player->movementVelocity={};
 	if(player->GetVelocity().mag()<"Player.Move Allowed Velocity Lower Limit"_F&&player->CanMove()){
 		auto GetPlayerStaircaseDirection=[&](){
 			for(LayerTag&layer:MAP_DATA[GetCurrentLevel()].LayerData){
@@ -460,14 +461,14 @@ void AiL::HandleUserInput(float fElapsedTime){
 				moveAmt*=controllerAmt;
 			}else animationSpd=1.f;
 			player->SetX(player->GetX()+fElapsedTime*moveAmt*player->GetMoveSpdMult());
-			player->movementVelocity.x=moveAmt*fElapsedTime*player->GetMoveSpdMult();
+			player->movementVelocity.x+=moveAmt*fElapsedTime*player->GetMoveSpdMult();
 			if(staircaseDirection=="RIGHT"){
 				player->SetY(player->GetY()-"Player.StaircaseClimbSpd"_F*fElapsedTime*player->GetMoveSpdMult());
-				player->movementVelocity.y=-"Player.StaircaseClimbSpd"_F*fElapsedTime*player->GetMoveSpdMult();
+				player->movementVelocity.y+=-"Player.StaircaseClimbSpd"_F*fElapsedTime*player->GetMoveSpdMult();
 			} else 
 				if(staircaseDirection=="LEFT"){
 					player->SetY(player->GetY()+"Player.StaircaseClimbSpd"_F*fElapsedTime*player->GetMoveSpdMult());
-					player->movementVelocity.y="Player.StaircaseClimbSpd"_F*fElapsedTime*player->GetMoveSpdMult();
+					player->movementVelocity.y+="Player.StaircaseClimbSpd"_F*fElapsedTime*player->GetMoveSpdMult();
 				}
 			player->SetFacingDirection(RIGHT);
 
@@ -488,14 +489,14 @@ void AiL::HandleUserInput(float fElapsedTime){
 				moveAmt*=controllerAmt;
 			}else animationSpd=1.f;
 			player->SetX(player->GetX()-fElapsedTime*moveAmt*player->GetMoveSpdMult());
-			player->movementVelocity.x=-moveAmt*fElapsedTime*player->GetMoveSpdMult();
+			player->movementVelocity.x+=-moveAmt*fElapsedTime*player->GetMoveSpdMult();
 			if(staircaseDirection=="RIGHT"){
 				player->SetY(player->GetY()+"Player.StaircaseClimbSpd"_F*fElapsedTime*player->GetMoveSpdMult());
-				player->movementVelocity.y="Player.StaircaseClimbSpd"_F*fElapsedTime*player->GetMoveSpdMult();
+				player->movementVelocity.y+="Player.StaircaseClimbSpd"_F*fElapsedTime*player->GetMoveSpdMult();
 			} else 
 			if(staircaseDirection=="LEFT"){
 				player->SetY(player->GetY()-"Player.StaircaseClimbSpd"_F*fElapsedTime*player->GetMoveSpdMult());
-				player->movementVelocity.y=-"Player.StaircaseClimbSpd"_F*fElapsedTime*player->GetMoveSpdMult();
+				player->movementVelocity.y+=-"Player.StaircaseClimbSpd"_F*fElapsedTime*player->GetMoveSpdMult();
 			}
 
 			newAimingAngle-=vf2d{1,0};
@@ -515,7 +516,7 @@ void AiL::HandleUserInput(float fElapsedTime){
 				moveAmt*=controllerAmt;
 			}else animationSpd=1.f;
 			player->SetY(player->GetY()-fElapsedTime*moveAmt*player->GetMoveSpdMult());
-			player->movementVelocity.y=-moveAmt*fElapsedTime*player->GetMoveSpdMult();
+			player->movementVelocity.y+=-moveAmt*fElapsedTime*player->GetMoveSpdMult();
 
 			newAimingAngle-=vf2d{0,1};
 
@@ -534,7 +535,7 @@ void AiL::HandleUserInput(float fElapsedTime){
 				moveAmt*=controllerAmt;
 			}else animationSpd=1.f;
 			player->SetY(player->GetY()+fElapsedTime*moveAmt*player->GetMoveSpdMult());
-			player->movementVelocity.y=moveAmt*fElapsedTime*player->GetMoveSpdMult();
+			player->movementVelocity.y+=moveAmt*fElapsedTime*player->GetMoveSpdMult();
 
 			newAimingAngle+=vf2d{0,1};
 
@@ -564,7 +565,6 @@ void AiL::HandleUserInput(float fElapsedTime){
 	}
 	if(UpReleased()){
 		player->SetLastReleasedMovementKey(UP);
-		player->movementVelocity.y=0;
 		if(player->GetState()==State::NORMAL||player->GetState()==State::PREP_CAST){
 			if(RightHeld()){
 				player->UpdateWalkingAnimation(RIGHT);
@@ -579,7 +579,6 @@ void AiL::HandleUserInput(float fElapsedTime){
 	}
 	if(RightReleased()){
 		player->SetLastReleasedMovementKey(RIGHT);
-		player->movementVelocity.x=0;
 		if(player->GetState()==State::NORMAL||player->GetState()==State::PREP_CAST){
 			if(UpHeld()){
 				player->UpdateWalkingAnimation(UP);
@@ -594,7 +593,6 @@ void AiL::HandleUserInput(float fElapsedTime){
 	}
 	if(LeftReleased()){
 		player->SetLastReleasedMovementKey(LEFT);
-		player->movementVelocity.x=0;
 		if(player->GetState()==State::NORMAL||player->GetState()==State::PREP_CAST){
 			if(RightHeld()){
 				player->UpdateWalkingAnimation(RIGHT);
@@ -609,7 +607,6 @@ void AiL::HandleUserInput(float fElapsedTime){
 	}
 	if(DownReleased()){
 		player->SetLastReleasedMovementKey(DOWN);
-		player->movementVelocity.y=0;
 		if(player->GetState()==State::NORMAL||player->GetState()==State::PREP_CAST){
 			if(RightHeld()){
 				player->UpdateWalkingAnimation(RIGHT);
@@ -3914,7 +3911,7 @@ void AiL::ShowDamageVignetteOverlay(){
 }
 
 void AiL::GlobalGameUpdates(){
-	levelTime+=fElapsedTime;
+	levelTime+=GetElapsedTime();
 	SteamAPI_RunCallbacks();
 	STEAMINPUT(
 		ActivateActionSetForAllControllers(Input::ingameControlsHandle);
@@ -3925,15 +3922,15 @@ void AiL::GlobalGameUpdates(){
 	for(std::vector<std::shared_ptr<DamageNumber>>::iterator it=DAMAGENUMBER_LIST.begin();it!=DAMAGENUMBER_LIST.end();++it){
 		DamageNumber*dn=(*it).get();
 		if(dn->pauseTime>0){
-			dn->pauseTime-=fElapsedTime;
+			dn->pauseTime-=GetElapsedTime();
 		} else{
-			dn->lifeTime+=fElapsedTime;
+			dn->lifeTime+=GetElapsedTime();
 			if(dn->lifeTime<=1){
 				if(dn->lifeTime<DamageNumber::MOVE_UP_TIME){
 					if(dn->invertedDirection){
-						dn->pos.y+=dn->riseSpd*fElapsedTime;
+						dn->pos.y+=dn->riseSpd*GetElapsedTime();
 					}else{
-						dn->pos.y-=dn->riseSpd*fElapsedTime;
+						dn->pos.y-=dn->riseSpd*GetElapsedTime();
 					}
 				}
 			}
@@ -3944,9 +3941,9 @@ void AiL::GlobalGameUpdates(){
 	if(GetMousePos()!=lastMousePos){
 		lastMouseMovement=0.f;
 		lastMousePos=GetMousePos();
-	}else lastMouseMovement+=fElapsedTime;
+	}else lastMouseMovement+=GetElapsedTime();
 
-	vignetteDisplayTime=std::max(0.f,vignetteDisplayTime-fElapsedTime);
+	vignetteDisplayTime=std::max(0.f,vignetteDisplayTime-GetElapsedTime());
 
 	if(Audio::Engine().IsPlaying(GetPlayer()->cooldownSoundInstance)){
 		Audio::Engine().SetVolume(GetPlayer()->cooldownSoundInstance,Audio::GetCalculatedSFXVolume("Audio.Casting Sound Volume"_F/100.f));

debug.sh

@@ -1 +1,2 @@
+git update-index --assume-unchanged "Adventures in Lestoria/packkey.cpp"
 cmake -DCMAKE_BUILD_TYPE=Debug -D_DEBUG=1 .;make -j 8

distribute.ps1

@@ -1,3 +1,4 @@
+git update-index --assume-unchanged "Adventures in Lestoria/packkey.cpp"
 rm -R bin
 mkdir bin
 mkdir bin/assets

distribute.sh

@@ -1,3 +1,4 @@
+git update-index --assume-unchanged "Adventures in Lestoria/packkey.cpp"
 rm -R release
 mkdir release
 mkdir release/assets

emscripten_build.ps1

@@ -1,3 +1,4 @@
+git update-index --assume-unchanged "Adventures in Lestoria/packkey.cpp"
 clear
 rm -R bin
 mkdir bin

emscripten_build.sh

@@ -1,3 +1,4 @@
+git update-index --assume-unchanged "Adventures in Lestoria/packkey.cpp"
 clear
 
 mkdir bin

emscripten_debug_build.ps1

@@ -1,3 +1,4 @@
+git update-index --assume-unchanged "Adventures in Lestoria/packkey.cpp"
 clear
 rm -R bin
 mkdir bin

emscripten_debug_build.sh

@@ -1,3 +1,4 @@
+git update-index --assume-unchanged "Adventures in Lestoria/packkey.cpp"
 clear
 source ./emsdk/emsdk_env.sh
 emcmake cmake -DCMAKE_BUILD_TYPE=Debug -D_DEBUG=1 .

emscripten_run.ps1

@@ -1 +1,2 @@
+git update-index --assume-unchanged "Adventures in Lestoria/packkey.cpp"
 emrun bin/index.html

emscripten_run.sh

@@ -1,3 +1,4 @@
-cp AdventuresInLestoria/play.html ./bin
+git update-index --assume-unchanged "Adventures in Lestoria/packkey.cpp"
+cp "Adventures in Lestoria/play.html" ./bin
 source ./emsdk/emsdk_env.sh
 emrun --no_browser bin/play.html

release.sh

@@ -1 +1,2 @@
+git update-index --assume-unchanged "Adventures in Lestoria/packkey.cpp"
 cmake -DCMAKE_BUILD_TYPE=Release .;make -j 8