diff --git a/SMACheck.au3 b/SMACheck.au3 index 9245395..12f425f 100644 --- a/SMACheck.au3 +++ b/SMACheck.au3 @@ -14,7 +14,7 @@ ;#AutoIt3Wrapper_Res_ProductVersion=x.x.x.x ; Broken, use #AutoIt3Wrapper_Res_Field=ProductVersion|x.x.x as workarround. #AutoIt3Wrapper_Res_Field=ProductVersion|Freeware -#AutoIt3Wrapper_Res_Fileversion=1.1.0.58 +#AutoIt3Wrapper_Res_Fileversion=1.1.0.59 #AutoIt3Wrapper_Res_FileVersion_AutoIncrement=N ;(Y/N/P) AutoIncrement FileVersion After Aut2EXE is finished. default=N. P=Prompt, Will ask at Compilation time if you want to increase the versionnumber #AutoIt3Wrapper_Res_Language=1033 ;Resource Language code . german = 1031, english (U.S.) = 1033. default 2057=English (United Kingdom). For a List see http://technet.microsoft.com/en-us/library/dd346950.aspx @@ -33,6 +33,11 @@ #AutoIt3Wrapper_res_file_add=.\resources\gfx\guibg.jpg, rt_rcdata, img_bg; http://www.autoitscript.com/forum/topic/51103-resources-udf/ ;#AutoIt3Wrapper_Res_File_Add=.\bg.bmp, rt_bitmap, img_bg +;; Ui Statuscions +#AutoIt3Wrapper_res_file_add=.\resources\gfx\tick16.png, rt_rcdata, tick.png +#AutoIt3Wrapper_res_file_add=.\resources\gfx\warning16.png, rt_rcdata, warning.png +#AutoIt3Wrapper_res_file_add=.\resources\gfx\error16.png, rt_rcdata, error.png + ;; Countryflags #AutoIt3Wrapper_res_file_add=.\resources\gfx\flags\ad.png, rt_rcdata, ad.png #AutoIt3Wrapper_res_file_add=.\resources\gfx\flags\ae.png, rt_rcdata, ae.png diff --git a/includes/functions.inc.au3 b/includes/functions.inc.au3 index 967b880..85bc91f 100644 --- a/includes/functions.inc.au3 +++ b/includes/functions.inc.au3 @@ -3,7 +3,8 @@ ;; SMAC XML APi Func lookupSteamId($input) HttpSetUserAgent("SMACheck/" & FileGetVersion(@ScriptName, "FileVersion")) - Local $oXML = InetRead("http://api.spiffytek.com/pub/smacheck/-testing/steamid/" & $input, 19) + ;Local $oXML = InetRead("http://api.spiffytek.com/pub/smacheck/-testing/steamid/" & $input, 19) + Local $oXML = InetRead("http://labor.spiffytek.com/smacheck/api/steamid/" & $input, 19) If @error <> 0 Then _printError("noapi") Return "ERROR_HANDELED" @@ -51,14 +52,9 @@ Func lookupSteamId($input) Local $bVac = _XMLGetValue("/isbanned/vacStatus") Local $bMod = _XMLGetValue("/isbanned/mod") Local $bCc = _XMLGetValue("/isbanned/country") - - If $bVac[1] = "1" Then - Local $pVac = "Bans on record" - ElseIf $bVac[1] = "-1" Then - Local $pVac = "Could not get Status from Steam" - Else - Local $pVac = "No" - EndIf + Local $bEac = _XMLGetValue("/isbanned/eacStatus") + Local $bEsea = _XMLGetValue("/isbanned/eseaStatus") + ;Local $bKac = _XMLGetValue("/isbanned/kacStatus") If $bCc[1] = "" Then $bCc[1] = "nocountry" @@ -66,26 +62,32 @@ Func lookupSteamId($input) If $pStatus[1] = "Y" Then Local $oStatus = "SteamID is Banned" - Local $return[8] + Local $return[11] $return[0] = $oStatus $return[1] = $bNick[1] $return[2] = $bReason[1] $return[3] = $bTime[1] $return[4] = $pStatus[1] - $return[5] = $pVac + $return[5] = $bVac[1] $return[6] = $bMod[1] $return[7] = $bCc[1] + $return[8] = $bEac[1] + $return[9] = $bEsea[1] + $return[10] = -1 Else Local $oStatus = "SteamID is not banned" - Local $return[8] + Local $return[11] $return[0] = $oStatus $return[1] = $bNick[1] $return[2] = "-" $return[3] = "-" $return[4] = $pStatus[1] - $return[5] = $pVac + $return[5] = $bVac[1] $return[6] = "-" $return[7] = "nocountry" + $return[8] = $bEac[1] + $return[9] = $bEsea[1] + $return[10] = -1 EndIf Else diff --git a/includes/gui.inc.au3 b/includes/gui.inc.au3 index 2805525..34a7f69 100644 --- a/includes/gui.inc.au3 +++ b/includes/gui.inc.au3 @@ -8,11 +8,11 @@ Func gui_Info($output) Local $overlayWidth = 312, $overlayHeight = 154, $pos = WinGetPos($GUi) $GUI2 = GUICreate("INFO (" & $output & ")", $overlayWidth, $overlayHeight, $pos[0] + 20, $pos[1] + 20, BitXOR($GUI_SS_DEFAULT_GUI, $WS_MINIMIZEBOX)) - If $pInfo[4] = "Y" Then - GUISetBkColor(0xE33F35) - Else - GUISetBkColor(0x518652) - EndIf + ;If $pInfo[4] = "Y" Then + ; GUISetBkColor(0xE33F35) + ;Else + ; GUISetBkColor(0x518652) + ;EndIf $bClose = GUICtrlCreateButton("OK", 120, 125, 65, 25, $BS_CENTER) GUICtrlSetBkColor(-1, $GUI_BKCOLOR_TRANSPARENT) GuiCtrlSetState(-1, 512) @@ -45,15 +45,51 @@ Func gui_Info($output) GUICtrlSetBkColor(-1, $GUI_BKCOLOR_TRANSPARENT) $oMod = GUICtrlCreateLabel($pInfo[6], 150, 84, 215, 17) GUICtrlSetBkColor(-1, $GUI_BKCOLOR_TRANSPARENT) - $gVac = GUICtrlCreateLabel("VAC:", 24, 108, 48, 17) + $gVac = GUICtrlCreateLabel("VAC:", 50, 105, 48, 17) GUICtrlSetFont(-1, 8, 800, 0, "MS Sans Serif") GUICtrlSetBkColor(-1, $GUI_BKCOLOR_TRANSPARENT) - $oVac = GUICtrlCreateLabel($pInfo[5], 72, 108, 215, 17) - If $pInfo[5] <> "No" And $pInfo[4] = "N" Then - GUICtrlSetBkColor(-1, 0xE33F35) + $oVac = GUICtrlCreatePic("", 80, 104, 16, 16) + If $pInfo[5] = "1" Then + _ResourceSetImageToCtrl(-1, "error.png", $RT_RCDATA) + ElseIf $pInfo[5] = "-1" Then + _ResourceSetImageToCtrl(-1, "warning.png", $RT_RCDATA) Else - GUICtrlSetBkColor(-1, $GUI_BKCOLOR_TRANSPARENT) + _ResourceSetImageToCtrl(-1, "tick.png", $RT_RCDATA) EndIf + $gEac = GUICtrlCreateLabel("EAC:", 100, 105, 48, 17) + GUICtrlSetFont(-1, 8, 800, 0, "MS Sans Serif") + GUICtrlSetBkColor(-1, $GUI_BKCOLOR_TRANSPARENT) + $oEac = GUICtrlCreatePic("", 130, 104, 16, 16) + If $pInfo[8] = "1" Then + _ResourceSetImageToCtrl(-1, "error.png", $RT_RCDATA) + ElseIf $pInfo[8] = "-1" Then + _ResourceSetImageToCtrl(-1, "warning.png", $RT_RCDATA) + Else + _ResourceSetImageToCtrl(-1, "tick.png", $RT_RCDATA) + EndIf + $gEsea = GUICtrlCreateLabel("ESEA:", 150, 105, 48, 17) + GUICtrlSetFont(-1, 8, 800, 0, "MS Sans Serif") + GUICtrlSetBkColor(-1, $GUI_BKCOLOR_TRANSPARENT) + $oEsea = GUICtrlCreatePic("", 190, 104, 16, 16) + If $pInfo[9] = "1" Then + _ResourceSetImageToCtrl(-1, "error.png", $RT_RCDATA) + ElseIf $pInfo[9] = "-1" Then + _ResourceSetImageToCtrl(-1, "warning.png", $RT_RCDATA) + Else + _ResourceSetImageToCtrl(-1, "tick.png", $RT_RCDATA) + EndIf + $gKac = GUICtrlCreateLabel("KAC:", 210, 105, 48, 17) + GUICtrlSetFont(-1, 8, 800, 0, "MS Sans Serif") + GUICtrlSetBkColor(-1, $GUI_BKCOLOR_TRANSPARENT) + $oKac = GUICtrlCreatePic("", 240, 104, 16, 16) + If $pInfo[10] = "1" Then + _ResourceSetImageToCtrl(-1, "error.png", $RT_RCDATA) + ElseIf $pInfo[10] = "-1" Then + _ResourceSetImageToCtrl(-1, "warning.png", $RT_RCDATA) + Else + _ResourceSetImageToCtrl(-1, "tick.png", $RT_RCDATA) + EndIf + GUISetState() diff --git a/resources/gfx/error16.png b/resources/gfx/error16.png new file mode 100644 index 0000000..eb5a8be Binary files /dev/null and b/resources/gfx/error16.png differ diff --git a/resources/gfx/tick16.png b/resources/gfx/tick16.png new file mode 100644 index 0000000..e4ba957 Binary files /dev/null and b/resources/gfx/tick16.png differ diff --git a/resources/gfx/warning16.png b/resources/gfx/warning16.png new file mode 100644 index 0000000..e9aa17c Binary files /dev/null and b/resources/gfx/warning16.png differ