Windows installation instructions refit

docs/installation.md

@@ -33,27 +33,18 @@ We do recommend Windows users to use [Docker](#docker) this will work much easie
 
 ##Requirements
 
-- [Python 2.7.x](http://docs.python-guide.org/en/latest/starting/installation/)
-- [git](https://git-scm.com/book/en/v2/Getting-Started-Installing-Git)
-- [Protoc](https://github.com/google/protobuf/releases/download/v3.0.0-beta-4/protoc-3.0.0-beta-4-win32.zip)
-- [Microsoft Visual C++ Compiler for Python 2.7](http://www.microsoft.com/en-us/download/details.aspx?id=44266)
-
 ###Easy Installation
-1. Download `PokemonGo-Bot-Install.bat` file from [HERE](https://raw.githubusercontent.com/nivong/PokemonGo-Bot/dev/windows_bat/PokemonGo-Bot-Install.bat)
-2. Run `PokemonGo-Bot-install.bat`
-After that has done the bot will be installed
-3. Run `PokemonGo-Bot-Start.bat`
-This will start the bot and the web interface
+1. Download [PokemonGo-Bot-Install.bat](https://github.com/PokemonGoF/PokemonGo-Bot/blob/master/windows_bat/PokemonGo-Bot-Install.bat)
+2. Download `encrypt.so` and `encrypt.dll` or `encrypt_64.dll` to the same folder of the `PokemonGo-Bot-Install.bat`.
+3. Run `PokemonGo-Bot-install.bat`.
+After that has been done the bot will be installed.
+4. Run `PokemonGo-Bot-Start.bat`.
+This will start the bot and the web interface.
 
 ### To update the bot
 3. Run `PokemonGo-Bot-Start.bat`
 This will check for an update and will start the bot afterwards.
 
-### To repair the bot if it isn't working for some reason
-1. Stop the bot by closing everything
-2. Run `PokemonGo-Bot-Repair.bat`
-3. Rerun the bot by using `PokemonGo-Bot-StartBot.bat`
-
 #Docker
 
 ###Easy installation

docs/manual_installation.md

@@ -7,7 +7,7 @@
 ### Linux and Mac
 Ubuntu will be used for the Linux Example
 
-####First install requierd packages
+####First install required packages
 
 #####Linux
 ```bash
@@ -91,49 +91,43 @@ source bin/activate
 
 
 ### Windows
-#### Windows vista, 7, 8:
-Go to : http://pyyaml.org/wiki/PyYAML , download the right version for your pc and install it
 
-##### Windows 10:
-Go to [this](http://www.lfd.uci.edu/~gohlke/pythonlibs/#pyyaml) page and download: PyYAML-3.11-cp27-cp27m-win32.whl
-(If running 64-bit python or if you get a 'not a supported wheel on this platform' error,
-download the 64 bit version instead: PyYAML-3.11-cp27-cp27m-win_amd64.whl )
+##### Requirements
 
-*(Run the following commands from Git Bash.)*
+- [Python 2.7.x](http://docs.python-guide.org/en/latest/starting/installation/)
+- [git](https://git-scm.com/book/en/v2/Getting-Started-Installing-Git)
+- [Microsoft Visual C++ Compiler for Python 2.7](http://www.microsoft.com/en-us/download/details.aspx?id=44266)
 
-```
-// switch to the directory where you downloaded PyYAML
-$ cd download-directory
-// install 32-bit version
-$ pip2 install PyYAML-3.11-cp27-cp27m-win32.whl
-// if you need to install the 64-bit version, do this instead:
-// pip2 install PyYAML-3.11-cp27-cp27m-win_amd64.whl
-```
 
-After this, just do:
+*Run the following commands in the Command Prompt with Administrator Privileges*
 
 ```
-$ git clone -b master https://github.com/PokemonGoF/PokemonGo-Bot
-$ cd PokemonGo-Bot
-$ virtualenv .
-$ script\activate
-$ pip2 install -r requirements.txt
-$ git submodule init
-$ git submodule update
+cd C:\Python27\
+pip2 install --upgrade pip
+pip2 install --upgrade virtualenv
+pip2 install --upgrade protobuf==3.0.0b4
+git clone --recursive -b dev https://github.com/PokemonGoF/PokemonGo-Bot
+pip2 install --upgrade "C:\Python27\PokemonGo-Bot\windows_bat\PyYAML-3.11-cp27-cp27m-win32.whl"
+pip2 install --upgrade "C:\Python27\PokemonGo-Bot\windows_bat\PyYAML-3.11-cp27-cp27m-win_amd64.whl"
+pip2 install --upgrade -r C:/Python27/PokemonGo-Bot/requirements.txt
+cd C:/Python27/PokemonGo-Bot/
+virtualenv .
+call C:\Python27\PokemonGo-Bot\Scripts\activate.bat
+pip2 install --upgrade -r C:/Python27/PokemonGo-Bot/requirements.txt
 ```
 
-##### Get encrypt.so (Windows part writing need fine tune)
-Due to copywrite on the encrypt.so we are not directly hosting it. Please find a copy elsewhere on the internet and compile it yourself. We accept no responsibility should you encounter any problems with files you download elsewhere.
+##### Get encrypt.so and encrypt.dll or encrypt_64.dll
+Due to copywrite on the encrypt.so, encrypt.dll and encrypt_64.dll we are not directly hosting it. Please find a copy elsewhere on the internet and compile it yourself. We accept no responsibility should you encounter any problems with files you download elsewhere.
+Try asking around our Slack chat!
 
-Ensure you are in the PokemonGo-Bot main folder and run:
-
-`wget http://pgoapi.com/pgoencrypt.tar.gz && tar -xf pgoencrypt.tar.gz && cd pgoencrypt/src/ && make && mv libencrypt.so ../../encrypt.so && cd ../..`
+Download it to the `C:/Python27/PokemonGo-Bot/` folder
 
 ##### Update
-To update your project do (in the project folder): `git pull`
-
-To update python requirement packages do (in the project folder): `pip install --upgrade -r requirements.txt`
-
-
 
+*Run the following commands in the Command Prompt with Administrator Privileges*
 
+```
+cd C:/Python27/PokemonGo-Bot/
+git pull
+git submodule update --init --recursive
+```