Fix mini scoreboard translated text

TriForceX · Jul 10, 2021 · 85e1ce1 · 85e1ce1
1 parent 6c3cf01
commit 85e1ce1
Show file tree

Hide file tree

Showing 6 changed files with 51 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,13 @@ The version control structure on this project is `<mayor>.<minor>.<patch>` where
 
 ---
 
+## 0.15.1
+- Fix special move camera check
+- Fix emote camera check
+- Fix scoreboard extras scale check
+- Fix scoreboard icons alignment
+- Fix mini scoreboard translated text
+
 ## 0.15.0
 - Fix some compiling warnings
 - Fix private duel end check and duel timer

diff --git a/README.md b/README.md
@@ -41,7 +41,7 @@ The next list is all *features* from the original **Jedi Knight Plus** private m
 - [ ] Player accounts system (Save data such as kills, deaths, etc...)
 - [ ] Ranking system (Based on player skills)
 - [x] Jetpack (Quake 3 & Jedi Academy style)
-- [x] Custom teleport frag
+- [x] Disable kill when player teleport or spawn inside another player
 - [ ] Chat censor filters
 - [x] Chat protection
 - [x] Allow black color in player names
@@ -76,9 +76,7 @@ The next list is all *features* from the original **Jedi Knight Plus** private m
 - [x] Force client plugin usage (Optional)
 - [x] Prevent player warping or lag scripts
 - [x] Server idle reset feature
-- [x] Custom map default music (For maps without background music)
 - [x] Improved custom map cycle
-- [x] Disable kill when player teleport or spawn inside another player
 - [ ] Drivable vehicles (Tie Fighter, X-Wing, AT-ST, etc...)
 - [ ] Custom melee weapon
 - [ ] Portal gun (Experimental)
@@ -111,6 +109,8 @@ The next list is all *features* from the original **Jedi Knight Plus** private m
 
 - [x] Various map fixes (Including single player maps to be playable)
 - [x] New custom map entities and fixed some BaseJK entities
+- [x] Custom map default music (For maps without background music)
+- [x] Support for defrag & race maps
 - [ ] Add models (GLM or MD3 format)
 - [ ] Add effects (EFX format)
 - [ ] Add any entity based on classname and parameters
@@ -119,7 +119,6 @@ The next list is all *features* from the original **Jedi Knight Plus** private m
 - [ ] Delete entities
 - [ ] Clone entities
 - [ ] Save feature to get all changes automatically stored in a loadable file
-- [x] Support for defrag & race maps
 
 ---
 

diff --git a/assets/client/strip/jkmod_ingame.sp b/assets/client/strip/jkmod_ingame.sp
@@ -1,7 +1,7 @@
 VERSION 1
 ID 137
 REFERENCE JKINGAME
-COUNT 9
+COUNT 11
 INDEX 0
 {
    REFERENCE RECORD
@@ -83,3 +83,21 @@ INDEX 8
    TEXT_LANGUAGE6 "Blue leads"
    TEXT_LANGUAGE8 "Azul va en cabeza"
 }
+INDEX 9
+{
+   REFERENCE RED
+   TEXT_LANGUAGE1 "Red"
+   TEXT_LANGUAGE2 "Rouge"
+   TEXT_LANGUAGE3 "Rot"
+   TEXT_LANGUAGE6 "Red"
+   TEXT_LANGUAGE8 "Rojo"
+}
+INDEX 10
+{
+   REFERENCE BLUE
+   TEXT_LANGUAGE1 "Blue"
+   TEXT_LANGUAGE2 "Bleu"
+   TEXT_LANGUAGE3 "Blau"
+   TEXT_LANGUAGE6 "Blue"
+   TEXT_LANGUAGE8 "Azul"
+}
diff --git a/assets/server/jkmod_server.cfg b/assets/server/jkmod_server.cfg
@@ -74,10 +74,10 @@ set g_log "jkmod_server.log"
 //                      JK2MV SETTINGS
 // -------------------------------------------------------- //
 
-// Set game version
+// Set game version:
 set mv_serverVersion "1.04"
 
-// Set fast HTTP downloads
+// Set fast HTTP downloads:
 set mv_httpDownloads "1"
 
 // See more info at: https://github.com/mvdevs/jk2mv/wiki/Cvars

diff --git a/code/cgame/cg_draw.c b/code/cgame/cg_draw.c
@@ -1635,12 +1635,26 @@ static float CG_DrawMiniScoreboard ( float y )
 
 	if ( cgs.gametype >= GT_TEAM )
 	{
-		strcpy ( temp, "Red: " );
-		Q_strcat ( temp, MAX_QPATH, cgs.scores1==SCORE_NOT_PRESENT?"-":(va("%i",cgs.scores1)) );
-		Q_strcat ( temp, MAX_QPATH, " Blue: " );
-		Q_strcat ( temp, MAX_QPATH, cgs.scores2==SCORE_NOT_PRESENT?"-":(va("%i",cgs.scores2)) );
+		// Tr!Force: [Scoreboard] Translated team scores
+		if (jkcvar_cg_scoreboardExtras.integer)
+		{
+			char *text;
+			int	scores1 = cgs.scores1 == SCORE_NOT_PRESENT ? 0 : cgs.scores1;
+			int	scores2 = cgs.scores2 == SCORE_NOT_PRESENT ? 0 : cgs.scores2;
 
-		CG_Text_Paint( cgs.screenWidth - 10 - CG_Text_Width ( temp, 0.7f, FONT_MEDIUM ), y, 0.7f, colorWhite, temp, 0, 0, ITEM_TEXTSTYLE_SHADOWEDMORE, FONT_MEDIUM );
+			text = va("%s: %i %s: %i", CG_GetStripEdString("JKINGAME", "RED"), scores1, CG_GetStripEdString("JKINGAME", "BLUE"), scores2);
+
+			CG_Text_Paint( cgs.screenWidth - 10 - CG_Text_Width ( text, 0.7f, FONT_MEDIUM ), y, 0.7f, colorWhite, text, 0, 0, ITEM_TEXTSTYLE_SHADOWEDMORE, FONT_MEDIUM );
+		}
+		else
+		{
+			strcpy ( temp, "Red: " );
+			Q_strcat ( temp, MAX_QPATH, cgs.scores1==SCORE_NOT_PRESENT?"-":(va("%i",cgs.scores1)) );
+			Q_strcat ( temp, MAX_QPATH, " Blue: " );
+			Q_strcat ( temp, MAX_QPATH, cgs.scores2==SCORE_NOT_PRESENT?"-":(va("%i",cgs.scores2)) );
+
+			CG_Text_Paint( cgs.screenWidth - 10 - CG_Text_Width ( temp, 0.7f, FONT_MEDIUM ), y, 0.7f, colorWhite, temp, 0, 0, ITEM_TEXTSTYLE_SHADOWEDMORE, FONT_MEDIUM );
+		}
 		y += 15;
 	}
 	else

diff --git a/jkplus/game/jk_version.h b/jkplus/game/jk_version.h
@@ -18,7 +18,7 @@ By Tr!Force. Work copyrighted (C) with holder attribution 2005 - 2020
 // Version
 #define JK_MAJOR 			"0"
 #define JK_MINOR 			"15"
-#define JK_PATCH  			"0"
+#define JK_PATCH  			"1"
 
 // Public
 #define JK_VERSION			JK_SHORTNAME " v" JK_MAJOR "." JK_MINOR "." JK_PATCH