Merge branch 'master' of github.com:Fluorohydride/ygopro

gframe/deck_con.cpp

@@ -144,8 +144,8 @@ inline void ShowBigCard(int code, float zoom) {
 inline void ZoomBigCard(s32 centerx = -1, s32 centery = -1) {
 	if(mainGame->deckBuilder.bigcard_zoom >= 4)
 		mainGame->deckBuilder.bigcard_zoom = 4;
-	if(mainGame->deckBuilder.bigcard_zoom <= 0.2)
-		mainGame->deckBuilder.bigcard_zoom = 0.2;
+	if(mainGame->deckBuilder.bigcard_zoom <= 0.2f)
+		mainGame->deckBuilder.bigcard_zoom = 0.2f;
 	ITexture* img = imageManager.GetBigPicture(mainGame->deckBuilder.bigcard_code, mainGame->deckBuilder.bigcard_zoom);
 	mainGame->imgBigCard->setImage(img);
 	auto size = img->getSize();
@@ -810,12 +810,12 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
 				break;
 			}
 			case BUTTON_BIG_CARD_ZOOM_IN: {
-				bigcard_zoom += 0.2;
+				bigcard_zoom += 0.2f;
 				ZoomBigCard();
 				break;
 			}
 			case BUTTON_BIG_CARD_ZOOM_OUT: {
-				bigcard_zoom -= 0.2;
+				bigcard_zoom -= 0.2f;
 				ZoomBigCard();
 				break;
 			}

lflist.conf

 #[2021.1][2020.12 TCG][2020.10][2020.7][2020.4][2020.1][2019.10][2019.7][2019.4][2019.1][2018.10][2018.7][2018.4][2018.1][2017.10][2017.7][2017.4][2017.1][2016.10][2016.7][2016.4][2016.1][2015.10][2015.4][2015.1][2014.10][2014.7][2014.4][2014.2][2013.9][2020.9 TCG][2020.6 TCG][2020.4 TCG][2020.1 TCG][2019.10 TCG][2019.7 TCG][2019.4 TCG][2019.1 TCG][2018.12 TCG][2018.9 TCG][2018.5 TCG][2018.2 TCG][2017.11 TCG][2017.9 TCG][2017.6 TCG][2017.3 TCG][2016.8 TCG][2016.4 TCG][2015.11 TCG][2015.7 TCG][2015.4 TCG][2015.1 TCG][2014.10 TCG][2014.7 TCG][2014.4 TCG][2014.1.1 TCG][2013.10.11 TCG][2013.3.1][2012.9.1][2012.3.1][2011.9.1]
 !2021.1
 #forbidden
+62472614 0 --疫病(tmp)
 91869203 0 --アマゾネスの射手
 20663556 0 --イレカエル
 44910027 0 --ヴィクトリー・ドラゴン

strings.conf

@@ -635,6 +635,7 @@
 !counter 0x58 指示物（祢须三破鸣比）
 !counter 0x59 落魂指示物
 !counter 0x5a 指示物（岩战之试炼）
+!counter 0x5b 指示物（北极天熊北斗星）
 #setnames, using tab for comment
 !setname 0x1 正义盟军	A・O・J
 !setname 0x2 次世代	ジェネクス
@@ -1095,3 +1096,6 @@
 !setname 0x15e 降阶魔法	RDM
 !setname 0x15f 岩战	War Rock
 !setname 0x160 源质兽	Materiactor
+!setname 0x161 溟界
+!setname 0x162 七音服	ドレミコード
+!setname 0x163 北极天熊	ベアルクティ