Merge branch 'master' into master

ReactiveDrop · Oct 18, 2023 · 2433fc0 · 2433fc0
2 parents c453639 + e9b7e54
commit 2433fc0
Show file tree

Hide file tree

Showing 8 changed files with 328 additions and 302 deletions.
diff --git a/PROGRESS.md b/PROGRESS.md
diff --git a/achievements/563560_loc_german.vdf b/achievements/563560_loc_german.vdf
@@ -375,29 +375,29 @@
 		"NEW_ACHIEVEMENT_2557_27_DESC"	"Besuche jede Zone (außer der Lobby) in der Akademie genau einmal."
 		"NEW_ACHIEVEMENT_2557_28_NAME"	"Keine Zeit zu verschwenden"
 		"NEW_ACHIEVEMENT_2557_28_DESC"	"Besiege in den Labor-Ruinen den Muon-Edelstein-Boss in drei Schlägen."
-		"NEW_ACHIEVEMENT_2557_29_NAME"	"" //"Easy Campaign: Reduction"
-		"NEW_ACHIEVEMENT_2557_29_DESC"	"" //"Complete the Reduction campaign on Easy difficulty or harder."
-		"NEW_ACHIEVEMENT_2557_30_NAME"	"" //"Normal Campaign: Reduction"
-		"NEW_ACHIEVEMENT_2557_30_DESC"	"" //"Complete the Reduction campaign on Normal difficulty or harder."
-		"NEW_ACHIEVEMENT_2557_31_NAME"	"" //"Hard Campaign: Reduction"
-		"NEW_ACHIEVEMENT_2557_31_DESC"	"" //"Complete the Reduction campaign on Hard difficulty or harder."
-		"NEW_ACHIEVEMENT_2727_0_NAME"	"" //"Insane Campaign: Reduction"
-		"NEW_ACHIEVEMENT_2727_0_DESC"	"" //"Complete the Reduction campaign on Insane difficulty or harder."
-		"NEW_ACHIEVEMENT_2727_1_NAME"	"" //"Brutal Campaign: Reduction"
-		"NEW_ACHIEVEMENT_2727_1_DESC"	"" //"Complete the Reduction campaign on Brutal difficulty."
-		"NEW_ACHIEVEMENT_2727_2_NAME"	"" //"Silent Station Speedrun"
-		"NEW_ACHIEVEMENT_2727_2_DESC"	"" //"Complete Silent Station within 4:40 on Normal difficulty or harder without any marines dying."
-		"NEW_ACHIEVEMENT_2727_3_NAME"	"" //"Operation Sandstorm Speedrun"
-		"NEW_ACHIEVEMENT_2727_3_DESC"	"" //"Complete Operation Sandstorm within 3:00 on Normal difficulty or harder without any marines dying."
-		"NEW_ACHIEVEMENT_2727_4_NAME"	"" //"Fallen City Speedrun"
-		"NEW_ACHIEVEMENT_2727_4_DESC"	"" //"Complete Fallen City within 1:38 on Normal difficulty or harder without any marines dying."
-		"NEW_ACHIEVEMENT_2727_5_NAME"	"" //"Stowaway Speedrun"
-		"NEW_ACHIEVEMENT_2727_5_DESC"	"" //"Complete Stowaway within 1:15 on Normal difficulty or harder without any marines dying."
-		"NEW_ACHIEVEMENT_2727_6_NAME"	"" //"Inevitable Escalation Speedrun"
-		"NEW_ACHIEVEMENT_2727_6_DESC"	"" //"Complete Inevitable Escalation within 6:00 on Normal difficulty or harder without any marines dying."
-		"NEW_ACHIEVEMENT_2727_7_NAME"	"" //"Nuclear Escort Speedrun"
-		"NEW_ACHIEVEMENT_2727_7_DESC"	"" //"Complete Nuclear Escort within 4:44 on Normal difficulty or harder without any marines dying."
-		"NEW_ACHIEVEMENT_2727_8_NAME"	"" //"Outstanding Execution: Reduction"
-		"NEW_ACHIEVEMENT_2727_8_DESC"	"" //"Complete the Reduction campaign on Normal difficulty or harder without any marines dying."
+		"NEW_ACHIEVEMENT_2557_29_NAME"	"Leicht: Reduktion"
+		"NEW_ACHIEVEMENT_2557_29_DESC"	"Beende den Feldzug \"Reduktion\" auf Leicht."
+		"NEW_ACHIEVEMENT_2557_30_NAME"	"Normal: Reduktion"
+		"NEW_ACHIEVEMENT_2557_30_DESC"	"Beende den Feldzug \"Reduktion\" auf Normal."
+		"NEW_ACHIEVEMENT_2557_31_NAME"	"Schwer: Reduktion"
+		"NEW_ACHIEVEMENT_2557_31_DESC"	"Beende den Feldzug \"Reduktion\" auf Schwer."
+		"NEW_ACHIEVEMENT_2727_0_NAME"	"Wahnsinnig: Reduktion"
+		"NEW_ACHIEVEMENT_2727_0_DESC"	"Beende den Feldzug \"Reduktion\" auf Wahnsinnig."
+		"NEW_ACHIEVEMENT_2727_1_NAME"	"Brutal: Reduktion"
+		"NEW_ACHIEVEMENT_2727_1_DESC"	"Beende den Feldzug \"Reduktion\" auf Brutal."
+		"NEW_ACHIEVEMENT_2727_2_NAME"	"Speedrun: Stille Station"
+		"NEW_ACHIEVEMENT_2727_2_DESC"	"Schließe den Einsatz \"Stille Station\" innerhalb von 4:40 auf Normal ab, ohne Verluste."
+		"NEW_ACHIEVEMENT_2727_3_NAME"	"Speedrun: Operation Sandsturm"
+		"NEW_ACHIEVEMENT_2727_3_DESC"	"Schließe den Einsatz \"Operation Sandsturm\" innerhalb von 3:00 auf Normal ab, ohne Verluste."
+		"NEW_ACHIEVEMENT_2727_4_NAME"	"Speedrun: Gefallene Stadt"
+		"NEW_ACHIEVEMENT_2727_4_DESC"	"Schließe den Einsatz \"Gefallene Stadt\" innerhalb von 1:38 auf Normal ab, ohne Verluste."
+		"NEW_ACHIEVEMENT_2727_5_NAME"	"Speedrun: Blinder Passagier"
+		"NEW_ACHIEVEMENT_2727_5_DESC"	"Schließe den Einsatz \"Blinder Passagier\" innerhalb von 1:15 auf Normal ab, ohne Verluste."
+		"NEW_ACHIEVEMENT_2727_6_NAME"	"Speedrun: Unvermeidbare Eskalation"
+		"NEW_ACHIEVEMENT_2727_6_DESC"	"Schließe den Einsatz \"Unvermeidbare Eskalation\" innerhalb von 6:00 auf Normal ab, ohne Verluste."
+		"NEW_ACHIEVEMENT_2727_7_NAME"	"Speedrun: Nuklearer Begleitschutz"
+		"NEW_ACHIEVEMENT_2727_7_DESC"	"Schließe den Einsatz \"Nuklearer Begleitschutz\" innerhalb von 4:44 auf Normal ab, ohne Verluste."
+		"NEW_ACHIEVEMENT_2727_8_NAME"	"Herausragend: Reduktion"
+		"NEW_ACHIEVEMENT_2727_8_DESC"	"Beende den Feldzug \"Reduktion\" auf Normal, ohne Verluste."
 	}
 }
diff --git a/achievements/563560_loc_japanese.vdf b/achievements/563560_loc_japanese.vdf
@@ -375,29 +375,29 @@
 		"NEW_ACHIEVEMENT_2557_27_DESC"	"Marine Academyの全てのゾーン(ロビーを除く)をちょうど1回ずつ通る。"
 		"NEW_ACHIEVEMENT_2557_28_NAME"	"時間が惜しい"
 		"NEW_ACHIEVEMENT_2557_28_DESC"	"Lab Ruinsのミッションで、ミュー粒子結晶のボスを3回の攻撃で倒す。"
-		"NEW_ACHIEVEMENT_2557_29_NAME"	"" //"Easy Campaign: Reduction"
-		"NEW_ACHIEVEMENT_2557_29_DESC"	"" //"Complete the Reduction campaign on Easy difficulty or harder."
-		"NEW_ACHIEVEMENT_2557_30_NAME"	"" //"Normal Campaign: Reduction"
-		"NEW_ACHIEVEMENT_2557_30_DESC"	"" //"Complete the Reduction campaign on Normal difficulty or harder."
-		"NEW_ACHIEVEMENT_2557_31_NAME"	"" //"Hard Campaign: Reduction"
-		"NEW_ACHIEVEMENT_2557_31_DESC"	"" //"Complete the Reduction campaign on Hard difficulty or harder."
-		"NEW_ACHIEVEMENT_2727_0_NAME"	"" //"Insane Campaign: Reduction"
-		"NEW_ACHIEVEMENT_2727_0_DESC"	"" //"Complete the Reduction campaign on Insane difficulty or harder."
-		"NEW_ACHIEVEMENT_2727_1_NAME"	"" //"Brutal Campaign: Reduction"
-		"NEW_ACHIEVEMENT_2727_1_DESC"	"" //"Complete the Reduction campaign on Brutal difficulty."
-		"NEW_ACHIEVEMENT_2727_2_NAME"	"" //"Silent Station Speedrun"
-		"NEW_ACHIEVEMENT_2727_2_DESC"	"" //"Complete Silent Station within 4:40 on Normal difficulty or harder without any marines dying."
-		"NEW_ACHIEVEMENT_2727_3_NAME"	"" //"Operation Sandstorm Speedrun"
-		"NEW_ACHIEVEMENT_2727_3_DESC"	"" //"Complete Operation Sandstorm within 3:00 on Normal difficulty or harder without any marines dying."
-		"NEW_ACHIEVEMENT_2727_4_NAME"	"" //"Fallen City Speedrun"
-		"NEW_ACHIEVEMENT_2727_4_DESC"	"" //"Complete Fallen City within 1:38 on Normal difficulty or harder without any marines dying."
-		"NEW_ACHIEVEMENT_2727_5_NAME"	"" //"Stowaway Speedrun"
-		"NEW_ACHIEVEMENT_2727_5_DESC"	"" //"Complete Stowaway within 1:15 on Normal difficulty or harder without any marines dying."
-		"NEW_ACHIEVEMENT_2727_6_NAME"	"" //"Inevitable Escalation Speedrun"
-		"NEW_ACHIEVEMENT_2727_6_DESC"	"" //"Complete Inevitable Escalation within 6:00 on Normal difficulty or harder without any marines dying."
-		"NEW_ACHIEVEMENT_2727_7_NAME"	"" //"Nuclear Escort Speedrun"
-		"NEW_ACHIEVEMENT_2727_7_DESC"	"" //"Complete Nuclear Escort within 4:44 on Normal difficulty or harder without any marines dying."
-		"NEW_ACHIEVEMENT_2727_8_NAME"	"" //"Outstanding Execution: Reduction"
-		"NEW_ACHIEVEMENT_2727_8_DESC"	"" //"Complete the Reduction campaign on Normal difficulty or harder without any marines dying."
+		"NEW_ACHIEVEMENT_2557_29_NAME"	"イージーキャンペーン: Reduction"
+		"NEW_ACHIEVEMENT_2557_29_DESC"	"Reduction キャンペーンの難易度イージー以上をクリアする。"
+		"NEW_ACHIEVEMENT_2557_30_NAME"	"ノーマルキャンペーン: Reduction"
+		"NEW_ACHIEVEMENT_2557_30_DESC"	"Reduction キャンペーンの難易度ノーマル以上をクリアする。"
+		"NEW_ACHIEVEMENT_2557_31_NAME"	"ハードキャンペーン: Reduction"
+		"NEW_ACHIEVEMENT_2557_31_DESC"	"Reduction キャンペーンの難易度ハード以上をクリアする。"
+		"NEW_ACHIEVEMENT_2727_0_NAME"	"エキスパートキャンペーン: Reduction"
+		"NEW_ACHIEVEMENT_2727_0_DESC"	"Reduction キャンペーンの難易度エキスパート以上をクリアする。"
+		"NEW_ACHIEVEMENT_2727_1_NAME"	"ブルータルキャンペーン: Reduction"
+		"NEW_ACHIEVEMENT_2727_1_DESC"	"Reduction キャンペーンの難易度ブルータルをクリアする。"
+		"NEW_ACHIEVEMENT_2727_2_NAME"	"Silent Stationスピードラン"
+		"NEW_ACHIEVEMENT_2727_2_DESC"	"誰も死ぬことなくノーマル以上の難易度のSilent Stationを4:40以内にクリアする。"
+		"NEW_ACHIEVEMENT_2727_3_NAME"	"Operation Sandstormスピードラン"
+		"NEW_ACHIEVEMENT_2727_3_DESC"	"誰も死ぬことなくノーマル以上の難易度のOperation Sandstormを3:00以内にクリアする。"
+		"NEW_ACHIEVEMENT_2727_4_NAME"	"Fallen Cityスピードラン"
+		"NEW_ACHIEVEMENT_2727_4_DESC"	"誰も死ぬことなくノーマル以上の難易度のFallen Cityを1:38以内にクリアする。"
+		"NEW_ACHIEVEMENT_2727_5_NAME"	"Stowawayスピードラン"
+		"NEW_ACHIEVEMENT_2727_5_DESC"	"誰も死ぬことなくノーマル以上の難易度のStowawayを1:15以内にクリアする。"
+		"NEW_ACHIEVEMENT_2727_6_NAME"	"Inevitable Escalationスピードラン"
+		"NEW_ACHIEVEMENT_2727_6_DESC"	"誰も死ぬことなくノーマル以上の難易度のInevitable Escalationを6:00以内にクリアする。"
+		"NEW_ACHIEVEMENT_2727_7_NAME"	"Nuclear Escortスピードラン"
+		"NEW_ACHIEVEMENT_2727_7_DESC"	"誰も死ぬことなくノーマル以上の難易度のNuclear Escortを4:44以内にクリアする。"
+		"NEW_ACHIEVEMENT_2727_8_NAME"	"卓越した任務遂行力: Reduction"
+		"NEW_ACHIEVEMENT_2727_8_DESC"	"誰も死ぬことなくReduction キャンペーンの難易度ノーマル以上をクリアする。"
 	}
 }
diff --git a/community/inventory_service/item-schema-automated.json b/community/inventory_service/item-schema-automated.json
@@ -1250,8 +1250,12 @@
 			"itemdefid": 41,
 			"type": "item",
 			"name_english": "Reduction Veteran",
+			"name_german": "Reduktion Veteran",
+			"name_japanese": "Reductionのベテラン",
 			"name_schinese": "无家可归老兵",
 			"description_english": "Awarded to commanders who demonstrated Outstanding Execution in the Reduction campaign.",
+			"description_german": "Verliehen an Kommandeure, die im Feldzug \"Reduktion\" herausragende Leistungen erzielt haben.",
+			"description_japanese": "Reductionのキャンペーンにて 「卓越した任務遂行力」を示した者に与えられる賞。",
 			"description_schinese": "勋章授予完美执行无家可归战役的玩家。",
 			"display_type_brazilian": "Medalha",
 			"display_type_english": "Medal",
@@ -1265,6 +1269,19 @@
 			"tags": "rarity:common;slot:medal",
 			"promo": "ach:RD_CAMPAIGN_NO_DEATHS_REDUCTION",
 			"item_slot": "medal"
+		},
+		{
+			"itemdefid": 42,
+			"type": "item",
+			"name_english": "Air Time",
+			"description_english": "Thrown in the air by the giant worm in Operation Sandstorm.\n\n[color=#bfbfbf]Worms Touched: %strange_42%\n[i]Stats are only updated while this item is equipped.[/i][/color]",
+			"display_type_english": "Medal",
+			"icon_url": "https://stats.reactivedrop.com/static/items/42.png",
+			"name_color": "CF6A32",
+			"tags": "rarity:strange_rarity;slot:medal;strange:42",
+			"promo": "manual",
+			"granted_manually": true,
+			"item_slot": "medal"
 		}
 	]
 }
diff --git a/release_notes/20231101_japanese.xml b/release_notes/20231101_japanese.xml
@@ -14,7 +14,7 @@
 
 [h2]メニュー[/h2]
 [list]
-[*]雨や雪、動的ライティング、エイリアンの影などを含むグラフィック関係の高度な設定の多くは、使用中のデバイスにのみ保存されてSteamクラウドで同期されることは無くなりました。これによりシェーダー品質、テクスチャ品質、アンチエイリアス設定と同様の挙動になった。
+[*]雨や雪、動的ライティング、エイリアンの影などを含むグラフィック関係の高度な設定の多くは、使用中のデバイスにのみ保存されてSteamクラウドで同期されることは無くなった。これによりシェーダー品質、テクスチャ品質、アンチエイリアス設定と同様の挙動になった。
 [*]プレイヤーは勲章を一度に3つまで装備できるようになった。
 [*]メインメニューの公開サーバープレビューがSteamグループに関わらず全てのサーバーを表示するように変更した。ランクマッチサーバー用のアイコンも追加した。
 [*]あるシーズン以降のランクマッチの勲章のように複数のスタイルがあるアイテムは、コレクションメニューから見た目を変更できるようになった。