Merge pull request #111 from TurningWheel/master

* merge master
TurningWheel · Jan 12, 2020 · 685c2ef · 685c2ef
2 parents 4ce6aef + 033952b
commit 685c2ef
Show file tree

Hide file tree

Showing 6 changed files with 71 additions and 15 deletions.
diff --git a/lang/en.txt b/lang/en.txt
@@ -1163,7 +1163,7 @@ Press 'Okay' to return to the main menu.#
 733 Random Character#
 734 Welcome to Barony, %s.#
 735 Press <%s> to review your inventory.#
-736 Click the right mouse button to use objects.
+736 Press <%s> to use objects.
 #
 737 You have entered the dungeon.#
 738 Please do not pirate this game!
@@ -4453,7 +4453,7 @@ Learnt alchemy ingredients:
 3370 Buggar#
 
 3371 mute player monster sounds#
-3372 Locked - DLC Coming Soon!#
+3372 Locked - Legends & Pariahs DLC Required!#
 3373 Show Race Info#
 3374 Hide Race Info#
 3375 Human
@@ -4573,7 +4573,7 @@ Traits:
 - Neutral to Incubi and Succubi
 - Immune to burning
 - Bonus +20 Tinkering to repairs
-- Starts with Salvage spell learnt# 
+- Starts with Salvage spell learnt#
 
 3381 Incubus
 
@@ -5756,5 +5756,43 @@ my fine wares.#
 3897 You spot a hidden compartment inside the chest!#
 3898 fails to dodge the incoming flaming boulder.#
 3899 fails to dodge the incoming arcane boulder.#
+3900 You can't place that there!#
+
+# More keybinds
+3901 Hotbar Scroll Left#
+3902 Hotbar Scroll Right#
+3903 Hotbar Select#
+3904 #
+3905 #
+3906 #
+3907 #
+3908 #
+3909 #
+
+3910 Remove thy garment
+before we deal!#
+3911 Sheathe thy weapon
+before we deal!#
+3912 Stow away thy tool
+before we deal!#
+3913 Unhand thy potion
+before we deal!#
+3914 Unwield thy jewels
+before we deal!#
+3915 Set down thy parchment
+before we deal!#
+3916 Unhand thy lunch
+before we deal!#
+3917 Locked - Legends & Pariahs DLC Required! Left click to view on the store page in Steam overlay.#
+3918 disable mouse rotation speed limit#
+3919 Return To Main Menu#
+3920
+       Do you wish to save before
+       returning to the main menu? 
+      Progress will be saved up to
+          the last checkpoint.
+
+        Selecting No will delete
+      your singleplayer save file!#
 
 3949 end#
diff --git a/playernames-female.txt b/playernames-female.txt
@@ -49,7 +49,9 @@ Ginny
 Viola
 Jadzia
 Missus Potato Queen
-
+Tink
+Mara Thornbrooke
+Cathillin
 
 Five
 Fishsticks
@@ -110,6 +112,9 @@ Pitcher
 Froyo Jeggings
 Dax
 qwertyuiopasdfghjklzxc
+Adjective Deppresso
+Sable
+Cheese Lord
 Lone Wolf
 Lucky Leol
 Shion

diff --git a/playernames-male.txt b/playernames-male.txt
@@ -52,6 +52,11 @@ Duke
 Daland Lawrence
 Moss
 Mr. Sterling
+Houston Jackson
+Cyrano
+Boxcar Joe
+Alduier Tarek
+Gereg
 Kalec
 Kladeos
 Gene of the Gods' Hand
@@ -121,7 +126,10 @@ Pitcher
 Froyo Jeggings
 Dax
 qwertyuiopasdfghjklzxc
+Adjective Deppresso
+Sable
+Cheese Lord
 Lone Wolf
 Lucky Leol
 Shion
-Danse the Safe
+Danse the Safe
diff --git a/src/actplayer.cpp b/src/actplayer.cpp
@@ -2045,6 +2045,9 @@ void actPlayer(Entity* my)
 		if (PLAYER_INWATER)
 		{
 			PLAYER_INWATER = 0;
+			PLAYER_BOBMOVE = 0;
+			PLAYER_BOB = 0;
+			PLAYER_BOBMODE = 0;
 		}
 
 	if (PLAYER_NUM == clientnum)
@@ -2065,7 +2068,7 @@ void actPlayer(Entity* my)
 					PLAYER_BOBMOVE -= .03;
 				}
 			}
-			if ( ((*inputPressed(impulses[IN_FORWARD]) || *inputPressed(impulses[IN_BACK])) || (*inputPressed(impulses[IN_RIGHT]) - *inputPressed(impulses[IN_LEFT])) || (game_controller && (game_controller->getLeftXPercent() || game_controller->getLeftYPercent()))) && !command && !swimming)
+			else if ( ((*inputPressed(impulses[IN_FORWARD]) || *inputPressed(impulses[IN_BACK])) || (*inputPressed(impulses[IN_RIGHT]) - *inputPressed(impulses[IN_LEFT])) || (game_controller && (game_controller->getLeftXPercent() || game_controller->getLeftYPercent()))) && !command && !swimming)
 			{
 				if ( !(stats[clientnum]->defending || stats[clientnum]->sneaking == 0) )
 				{
@@ -2195,7 +2198,9 @@ void actPlayer(Entity* my)
 		}
 		else
 		{
+			PLAYER_BOBMOVE = 0;
 			PLAYER_BOB = 0;
+			PLAYER_BOBMODE = 0;
 		}
 
 		// object interaction

diff --git a/src/game.cpp b/src/game.cpp
@@ -291,6 +291,13 @@ void gameLogic(void)
 			camera_shakey += 1;
 		}
 	}
+	else
+	{
+		camera_shakex = 0;
+		camera_shakey = 0;
+		camera_shakex2 = 0;
+		camera_shakey2 = 0;
+	}
 
 	// drunkenness
 	if ( !intro )
@@ -2900,7 +2907,7 @@ void startMessages()
 {
 	newString(&messages, 0xFFFFFFFF, language[734], stats[clientnum]->name);
 	newString(&messages, 0xFFFFFFFF, language[735], getInputName(impulses[IN_STATUS]));
-	newString(&messages, 0xFFFFFFFF, language[736]);
+	newString(&messages, 0xFFFFFFFF, language[736], getInputName(impulses[IN_USE]));
 	newString(&messages, 0xFFFFFFFF, language[737]);
 }
 

diff --git a/src/interface/drawminimap.cpp b/src/interface/drawminimap.cpp
@@ -122,14 +122,7 @@ void drawMinimap()
 				{
 					if ( ticks % 40 - ticks % 20 )
 					{
-						if ( !colorblind )
-						{
-							glColor4f( 1, 0, 0, 1 );
-						}
-						else
-						{
-							glColor4f( 0, 1, 1, 1 );
-						}
+						glColor4f( 0, 1, 1, 1 );
 						//glBegin(GL_QUADS);
 						glVertex2f(x * minimapTotalScale + xres - map.width * minimapTotalScale, map.height * minimapTotalScale - y * minimapTotalScale - minimapTotalScale);
 						glVertex2f(x * minimapTotalScale + xres - map.width * minimapTotalScale + minimapTotalScale, map.height * minimapTotalScale - y * minimapTotalScale - minimapTotalScale);