Skip to content

Commit 4755d94

Browse files
committed
Merge branch 'dev' into GOD_PAGE
2 parents 721a0f6 + d227cb0 commit 4755d94

File tree

3 files changed

+36
-32
lines changed

3 files changed

+36
-32
lines changed

README.md

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Playing mafia game made easy simply by having:
77

88
There you go, lets play some mafia :sunglasses:.
99

10-
<img src="https://raw.githubusercontent.com/sadrasabouri/mafia/README_update/doc/Pictures/mafia_game.png">
10+
<img src="https://raw.githubusercontent.com/sadrasabouri/mafia/master/doc/Pictures/mafia_game.png">
1111

1212
## Usage
1313
After cloning into mafia using command bellow:
@@ -47,7 +47,7 @@ There you go, now each player can open a browser and type `serverhost:port_name`
4747
In defualt mode your address should be `server_ip:5000`.
4848
| What player should see in the browser |
4949
|:-------------------------------------:|
50-
| <img width="324" height="576" src="https://raw.githubusercontent.com/sadrasabouri/mafia/README_update/doc/Pictures/mobile_browser.png"> |
50+
| <img width="324" height="576" src="https://raw.githubusercontent.com/sadrasabouri/mafia/master/doc/Pictures/mobile_browser.png"> |
5151

5252
4. <b>Tracing roles from commandline</b>
5353

@@ -56,7 +56,7 @@ players should inform the GOD with thier unique id so that GOD can find who is w
5656

5757
| What GOD should see in the CLI |
5858
|:------------------------------:|
59-
| <img width="435" height="204" src="https://raw.githubusercontent.com/sadrasabouri/mafia/README_update/doc/Pictures/CLI.png"> |
59+
| <img width="435" height="204" src="https://raw.githubusercontent.com/sadrasabouri/mafia/master/doc/Pictures/CLI.png"> |
6060

6161
## Game Rules
6262
Mafia is a social deduction game, created by Dimitry Davidoff in 1986. The game models a conflict between two groups: an informed minority (the mafia team), and an uninformed majority (the Residents).
@@ -79,15 +79,15 @@ Dead players are not permitted to attempt to influence the remainder of the game
7979
The game continues until a faction achieves its win condition; for the Residents, this usually means eliminating the whole mafia team, while for the minority this usually means reaching numerical parity with the Residents.
8080

8181
### Roles
82-
| Role | image(s) |
83-
| :-------------: |:----------------------------------------------------------------------------------------------------------------------------: |
84-
| Don | <img width="100" height="100" src="https://raw.githubusercontent.com/sadrasabouri/mafia/master/static/images/roles/Don_1.png"> |
85-
| Mafia | <img width="100" height="100" src="https://raw.githubusercontent.com/sadrasabouri/mafia/master/static/images/roles/Mafia_1.png"><img width="100" height="100" src="https://raw.githubusercontent.com/sadrasabouri/mafia/master/static/images/roles/Mafia_2.png"> |
86-
| Rebel | <img width="100" height="100" src="https://raw.githubusercontent.com/sadrasabouri/mafia/master/static/images/roles/Rebel_1.png"> |
87-
| Detective | <img width="100" height="100" src="https://raw.githubusercontent.com/sadrasabouri/mafia/master/static/images/roles/Doctor_1.png"><img width="100" height="100" src="https://raw.githubusercontent.com/sadrasabouri/mafia/master/static/images/roles/Doctor_2.png"> |
88-
| Detective | <img width="100" height="100" src="https://raw.githubusercontent.com/sadrasabouri/mafia/master/static/images/roles/Detective_1.png"> |
89-
| Anti-attack | <img width="100" height="100" src="https://raw.githubusercontent.com/sadrasabouri/mafia/master/static/images/roles/Anti-attack_1.png"> |
90-
| Resident | <img width="100" height="100" src="https://raw.githubusercontent.com/sadrasabouri/mafia/master/static/images/roles/Resident_1.png"><img width="100" height="100" src="https://raw.githubusercontent.com/sadrasabouri/mafia/master/static/images/roles/Resident_2.png"><img width="100" height="100" src="https://raw.githubusercontent.com/sadrasabouri/mafia/master/static/images/roles/Resident_3.png"><img width="100" height="100" src="https://raw.githubusercontent.com/sadrasabouri/mafia/master/static/images/roles/Resident_4.png"> |
82+
| Role | image(s) | Descriptions |
83+
|:----:|:--------:|:------------:|
84+
| Don | <img width="100" height="100" src="https://raw.githubusercontent.com/sadrasabouri/mafia/master/static/images/roles/Don_1.png"> | Don is the boss of the mafia group. At night mode Don decides whom to be killed from the mafia team.Don can't be detected by detective. |
85+
| Mafia | <img width="100" height="100" src="https://raw.githubusercontent.com/sadrasabouri/mafia/master/static/images/roles/Mafia_1.png"><img width="100" height="100" src="https://raw.githubusercontent.com/sadrasabouri/mafia/master/static/images/roles/Mafia_2.png"> | Mafia is the simple participant of the mafia team. Mafia gets up at night and try to decide which one of the players they want to kill, detective can detect this kind of mafia in night mode. |
86+
| Rebel | <img width="100" height="100" src="https://raw.githubusercontent.com/sadrasabouri/mafia/master/static/images/roles/Rebel_1.png"> | Rebel is from city team which gets up at night mode and kills a person.if the victim was chosen from residents, Rebel (him/her)self may die. |
87+
| Doctor | <img width="100" height="100" src="https://raw.githubusercontent.com/sadrasabouri/mafia/master/static/images/roles/Doctor_1.png"><img width="100" height="100" src="https://raw.githubusercontent.com/sadrasabouri/mafia/master/static/images/roles/Doctor_2.png"> | Doctor is a helpful participant of city team which gets up after mafia team and tries to rescue a person (or two in the first night) from mafia's shot. |
88+
| Detective | <img width="100" height="100" src="https://raw.githubusercontent.com/sadrasabouri/mafia/master/static/images/roles/Detective_1.png"> | Detective is from city team gets up at night mode and tries to ask GOD if someone is good (Resident, Doctor, Rebel, Bulletproof) or bad(Mafia), but his/her first attempt to ask from. Don may be answered incorrect by GOD. |
89+
| Bulletproof | <img width="100" height="100" src="https://raw.githubusercontent.com/sadrasabouri/mafia/master/static/images/roles/Bulletproof_1.png"> | Bulletproof is the most powerful resident which doesn't hurt from night shots. he/she won't die through night mode. |
90+
| Resident | <img width="100" height="100" src="https://raw.githubusercontent.com/sadrasabouri/mafia/master/static/images/roles/Resident_1.png"><img width="100" height="100" src="https://raw.githubusercontent.com/sadrasabouri/mafia/master/static/images/roles/Resident_2.png"><img width="100" height="100" src="https://raw.githubusercontent.com/sadrasabouri/mafia/master/static/images/roles/Resident_3.png"><img width="100" height="100" src="https://raw.githubusercontent.com/sadrasabouri/mafia/master/static/images/roles/Resident_4.png"> | Resident is the typical player of the game. he/she has no power but to blame mafia in order to remove them from the game in day mode. |
9191

9292
## References
9393
Icons made by <a href="https://www.flaticon.com/authors/vectors-market" title="Vectors Market">Vectors Market</a> and <a href="https://www.flaticon.com/authors/pixel-perfect" title="Pixel perfect">Pixel perfect</a> from <a href="https://www.flaticon.com/" title="Flaticon"> www.flaticon.com</a>

mafia_params.py

Lines changed: 24 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"Mafia",
88
"Resident",
99
"Rebel",
10-
"Anti-attack",
10+
"Bulletproof",
1111
"Mafia",
1212
"Resident",
1313
"Resident",
@@ -25,32 +25,36 @@
2525
"Doctor" : 2,
2626
"Rebel" : 1,
2727
"Detective" : 1,
28-
"Anti-attack" : 1}
28+
"Bulletproof" : 1}
2929

30-
descriptions = {"Don" : "Don is the boss of the mafia group. At night mode Don decides whom to be killed from the mafia team.",
31-
"Resident" : "Resident is the typical player of the game. he/she has no power but to blame mafia in order to remove them from the game in day mode.",
32-
"Mafia" : "Mafia is the simple participant of the mafia team. Mafia gets up at night and try to decide which one of the players they want to kill.",
33-
"Doctor": "Doctor gets up after mafia team and tries to rescue a person (or two in the first night) from mafia's shot.",
34-
"Detective" : "Detective gets up after Doctor and tries to ask GOD if someone is good (Resident, Doctor, Rebel, Anti-attack)."
35-
"or bad(Mafia), but his/her first attempt to ask from Don may be answered incorrect by GOD.",
36-
"Rebel" : "Rebel gets up at night mode and kills a person.if the victim was chosen from residents, Rebel (him/her)self may die.",
37-
"Anti-attack" : "Anti-attack doesn't hurt from night shots. he/she won't die through night mode."}
30+
descriptions = {"Don" : "Don is the boss of the mafia group. At night mode Don decides whom to be killed from the mafia team."
31+
"Don can't be detected by detective.",
32+
"Resident" : "Resident is the typical player of the game. he/she has no power but to blame mafia in order to remove "
33+
"them from the game in day mode.",
34+
"Mafia" : "Mafia is the simple participant of the mafia team. Mafia gets up at night and try to decide which one of"
35+
"the players they want to kill, detective can detect this kind of mafia in night mode.",
36+
"Doctor": "Doctor is a helpful participant of city team which gets up after mafia team and tries to rescue a person"
37+
" (or two in the first night) from mafia's shot.",
38+
"Detective" : "Detective is from city team gets up at night mode and tries to ask GOD if someone is good"
39+
" (Resident, Doctor, Rebel, Bulletproof) or bad(Mafia), but his/her first attempt to ask from"
40+
" Don may be answered incorrect by GOD.",
41+
"Rebel" : "Rebel is from city team which gets up at night mode and kills a person.if the victim was chosen from"
42+
" residents, Rebel (him/her)self may die.",
43+
"Bulletproof" : "Bulletproof is the most powerful resident which doesn't hurt from night shots. he/she won't die"
44+
" through night mode."}
3845

39-
descriptions_fa = {"Don" : "دن رییس گروه مافیا است. در شب دن تصمیم می گیرد که چه کسی را از طرف تیم مافیا خارج کند",
46+
descriptions_fa = {"Don" : "اين نقش سردسته تيم مافيا مي باشد و مسئوليت تيم مافيا بر عهده دُن است.امتياز حائز اهميتی که دُن در بازی دارد اين است که استعلامش توسط کاراگاه همانند شهروندان منفی میباشد.",
4047
"Resident" : "شهروند عضو ساده شهر است. تنها قدرتی که شهروند دارد حذف افراد به واسطه رای گیری در روز است",
41-
"Mafia" : "مافیا عضو ساده تیم مافیا است. او هر شب بیدار می شود و به همراه مافیا دیگر عضو پیشنهادی برای حذف را به دن معرفی میکنند",
42-
"Doctor": "دکتر عضو تیم شهروندان است. او هر شب از خواب بیدار می شود و یک (یا ۲ در شب اول) نفر را از خطر مرگ توسط مافیا حفظ میکند",
43-
"Detective" : "کار آگاه عضو تیم شهروندان است. او در شب از خواب بیدار می شود و از یکی از بازیکن ها استعلام میگیرد"
44-
" خدا وضعیت شخص را (مافیا بودن یا نبودن او را) به اطلاعش می رساند. ضمنا اولین استعلام کارآگاه راجع به دن"
45-
"وضعیت او را مشخص نمیکند",
46-
"Rebel" : "شورشی عضو تیم شهروندان است. او در شب از خواب بیدار می شود و سعی میکند یکی از اعضای تیم مافیا را هدف بگیرد در صورتی که"
47-
"او مافیا را به درستی تشخیص دهد مافیا خواهد مرد و در غیر این صورت شورشی در اثر غم کشتن یک شهروند خود می میرد",
48-
"Anti-attack" : "ضد ضربه از ضربات شب مافیا و شورشی در امان است. او هیچگاه در شب نمی میرد"}
48+
"Mafia" : "از اعضای تیم مافیا میباشد و اگر کارآگاه از او استعلام بگیرد، استعلامش مثبت می شود",
49+
"Doctor": "دکتر يکی از اعضای تیم شهروند ميباشد که در فاز شب به فرمان خدای بازی چشم هايش را باز کرده و ميتواند خود و يا يکی از بازيکنان را از حذف شدن و کشته شدن در فاز شب بازی نجات دهد.",
50+
"Detective" : "کارآگاه يکی از اعضای تیم شهروند ميباشد که در فاز شب چشم هايش را باز کرده و ميتواند از خدای بازی هويت يکی از افراد بازی را بپرسد ، و خدا با اشاره بله يا خیر به کاراگاه ميگويد که فرد استعلام شده جزو اعضای مافيا هست يا نه",
51+
"Rebel" : "از اعضای تیم شهروند میباشد و در فاز شب میتواند کسی را که فکر میکند مافیا است را هدف قرار دهد اگر شخص مافیا بود خواهد مرد.اما اگر شورشی به اشتباه یک شهروند را هدف قرار دهد خودش خواهد مرد.",
52+
"Bulletproof" : "ضد ضربه قوی ترين شهروند بازی ميباشد ،و از هر تير مافیا در فاز شب در امان ميباشد.بنابرين ضد ضربه توسط مافيا در فاز شب قابل کشته شدن نميباشد"}
4953

5054
role2fa = {"Don" : "دن",
5155
"Resident" : "شهروند",
5256
"Mafia" : "مافیا",
5357
"Doctor": "دکتر",
5458
"Detective" : "کارآگاه",
5559
"Rebel" : "شورشی",
56-
"Anti-attack" : "ضد ضربه"}
60+
"Bulletproof" : "ضد ضربه"}

0 commit comments

Comments
 (0)