Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge dev to master - docs update #5948

Merged
merged 2 commits into from
Mar 4, 2017
Merged

Merge dev to master - docs update #5948

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
104a8e0
updating docs
pogarek Mar 4, 2017
f791c0e
Merge pull request #5947 from pogarek/dev
pogarek Mar 4, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions docs/faq.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
### Do I need hashing key ?
Without hashing key, the bot will use API in version 0.45, which is not used in legit game any longer. Learn more about - [hashing key here](http://hashing.pogodev.org).

### How do I start the application?
After [installing] (https://github.com/PokemonGoF/PokemonGo-Bot/blob/dev/docs/installation.md), in the root folder run the following command:
### Linux
Expand Down
9 changes: 5 additions & 4 deletions docs/installation.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
- [pip](https://pip.pypa.io/en/stable/installing/)
- [git](https://git-scm.com/book/en/v2/Getting-Started-Installing-Git)
- [virtualenv](https://virtualenv.pypa.io/en/stable/installation/) (Recommended)
- [hashing key](http://hashing.pogodev.org) - if you want use latest API, not the old, 0.45

### Easy installation
1. Clone the git: `git clone https://github.com/PokemonGoF/PokemonGo-Bot`
Expand All @@ -32,14 +33,14 @@ for manual installation please refer to [here](https://github.com/PokemonGoF/Pok
We do recommend Windows users to use [Docker](#docker) this will work much easier and smoother (also safer)

## Requirements
- [hashing key](http://hashing.pogodev.org) - if you want use latest API, not the old, 0.45

### Easy Installation
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`.
2. Run `PokemonGo-Bot-install.bat`.
After that has been done the bot will be installed.
4. Run `PokemonGo-Bot-Configurator` to create auth.json, config.json and userdata.js.
5. Run `PokemonGo-Bot-Start.bat`.
3. Run `PokemonGo-Bot-Configurator` to create auth.json, config.json and userdata.js.
4. Run `PokemonGo-Bot-Start.bat`.
This will start the bot and the web interface.

### To update the bot
Expand Down
14 changes: 3 additions & 11 deletions docs/manual_installation.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# Manual installation
Consider purchase of [hashing key](http://hashing.pogodev.org) - if you want use latest API, not the old, 0.45

## Table of Contents
- [Linux and Mac Installation](#linux-and-mac)
Expand Down Expand Up @@ -55,17 +56,13 @@ virtualenv .
source bin/activate
```
####
- install the requirements and get the needed encryption.so
- install the requirements


(we move `encrypt.so` to the root folder of the Bot so no need to edit the config regarding that)
```bash
pip install -r requirements.txt
wget http://pgoapi.com/pgoencrypt.tar.gz
tar -xzvf pgoencrypt.tar.gz
cd pgoencrypt/src/
make
cd ../../
mv pgoencrypt/src/libencrypt.so encrypt.so
```
####
- copy and edit the config
Expand Down Expand Up @@ -121,11 +118,6 @@ call C:\Python27\PokemonGo-Bot\Scripts\activate.bat
pip2 install --upgrade -r C:/Python27/PokemonGo-Bot/requirements.txt
```

##### Get encrypt.so and encrypt.dll or encrypt_64.dll
Due to copyright 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 **(Just say the word "encrypt" and Slackbot will give you info)**!

Download it to the `C:/Python27/PokemonGo-Bot/` folder

##### Update

Expand Down