Skip to content

Commit

Permalink
"In broad daylight" update. 4 new roles. Improved status check message.
Browse files Browse the repository at this point in the history
  • Loading branch information
@WhiteCloud21
WhiteCloud21 committed May 1, 2018
1 parent fc0949e commit 7f6efba
Show file tree
Hide file tree
Showing 43 changed files with 866 additions and 75 deletions.
15 changes: 14 additions & 1 deletion DiscordMafia/Activity/BooleanVoteActivity.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,16 @@ public class BooleanVoteActivity : BaseActivity
{
public BooleanVote Vote { get; protected set; }
public bool Value { get; protected set; }
public int Weight { get; protected set; }
public EWeightType WeightType { get; protected set; }

public BooleanVoteActivity(InGamePlayerInfo player, BooleanVote vote, bool value)
public BooleanVoteActivity(InGamePlayerInfo player, BooleanVote vote, bool value, int weight, EWeightType weightType)
: base(player)
{
Vote = vote;
Value = value;
Weight = weight;
WeightType = weightType;
Player.EveningVoteActivity = this;
}

Expand All @@ -29,4 +33,13 @@ protected override void OnCancel(InGamePlayerInfo onlyAgainstTarget)
}
}
}

[Flags]
public enum EWeightType
{
None = 0,
Positive = 1,
Negative = 2,
Both = 3
}
}
5 changes: 5 additions & 0 deletions DiscordMafia/Config/GameSettings.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ public class GameSettings : IXmlSerializable
public int DayTime { get; protected set; }
public int EveningTime { get; protected set; }
public int NightTime { get; protected set; }
public int MaxInactiveDays { get; protected set; }
public byte MaxUsersToNotify { get; protected set; }
public int MinNotificationInterval { get; protected set; }

Expand Down Expand Up @@ -65,6 +66,7 @@ public GameSettings(MainSettings mainSettings, string gametype)
EveningTime = 30000;
NightTime = 90000;
InfectionChancePercent = 33;
MaxInactiveDays = 3;
MaxUsersToNotify = 50;
MinNotificationInterval = 7200;
ShowNightActions = true;
Expand Down Expand Up @@ -184,6 +186,9 @@ public void ReadXml(XmlReader reader)
case "MaxUsersToNotify":
MaxUsersToNotify = byte.Parse(reader.ReadElementContentAsString());
break;
case "MaxInactiveDays":
MaxInactiveDays = int.Parse(reader.ReadElementContentAsString());
break;
case "InfectionChancePercent":
InfectionChancePercent = short.Parse(reader.ReadElementContentAsString());
break;
Expand Down
15 changes: 15 additions & 0 deletions DiscordMafia/Config/Gametypes/yakuza-only/roles.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,11 @@
<IsRandom>true</IsRandom>
<MinPlayers>10</MinPlayers>
</Role>
<Role Id="RabbleRouser">
<IsEnabled>true</IsEnabled>
<IsRandom>false</IsRandom>
<MinPlayers>12</MinPlayers>
</Role>
<Role Id="Sergeant">
<IsEnabled>true</IsEnabled>
<IsRandom>false</IsRandom>
Expand All @@ -70,6 +75,11 @@
<IsRandom>true</IsRandom>
<MinPlayers>10</MinPlayers>
</Role>
<Role Id="Kamikaze">
<IsEnabled>true</IsEnabled>
<IsRandom>false</IsRandom>
<MinPlayers>12</MinPlayers>
</Role>
<Role Id="Maniac">
<IsEnabled>true</IsEnabled>
<IsRandom>true</IsRandom>
Expand All @@ -85,6 +95,11 @@
<IsRandom>true</IsRandom>
<MinPlayers>8</MinPlayers>
</Role>
<Role Id="Poisoner">
<IsEnabled>true</IsEnabled>
<IsRandom>true</IsRandom>
<MinPlayers>8</MinPlayers>
</Role>
<Role Id="Hacker">
<IsEnabled>true</IsEnabled>
<IsRandom>true</IsRandom>
Expand Down
20 changes: 20 additions & 0 deletions DiscordMafia/Config/Gametypes/yakuza/roles.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,11 @@
<IsRandom>true</IsRandom>
<MinPlayers>10</MinPlayers>
</Role>
<Role Id="RabbleRouser">
<IsEnabled>true</IsEnabled>
<IsRandom>false</IsRandom>
<MinPlayers>15</MinPlayers>
</Role>
<Role Id="Sergeant">
<IsEnabled>true</IsEnabled>
<IsRandom>false</IsRandom>
Expand All @@ -75,6 +80,11 @@
<IsRandom>true</IsRandom>
<MinPlayers>10</MinPlayers>
</Role>
<Role Id="Hammerer">
<IsEnabled>true</IsEnabled>
<IsRandom>false</IsRandom>
<MinPlayers>15</MinPlayers>
</Role>
<Role Id="Hoodlum">
<IsEnabled>true</IsEnabled>
<IsRandom>true</IsRandom>
Expand All @@ -85,6 +95,11 @@
<IsRandom>true</IsRandom>
<MinPlayers>10</MinPlayers>
</Role>
<Role Id="Kamikaze">
<IsEnabled>true</IsEnabled>
<IsRandom>false</IsRandom>
<MinPlayers>15</MinPlayers>
</Role>
<Role Id="Maniac">
<IsEnabled>true</IsEnabled>
<IsRandom>true</IsRandom>
Expand All @@ -100,6 +115,11 @@
<IsRandom>true</IsRandom>
<MinPlayers>8</MinPlayers>
</Role>
<Role Id="Poisoner">
<IsEnabled>true</IsEnabled>
<IsRandom>true</IsRandom>
<MinPlayers>8</MinPlayers>
</Role>
<Role Id="Hacker">
<IsEnabled>true</IsEnabled>
<IsRandom>true</IsRandom>
Expand Down
102 changes: 101 additions & 1 deletion DiscordMafia/Config/Lang/en/messages.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,18 @@
<string>Not enough players ({count}/{minCount})</string>
</ArrayOfString>
</Item>
<Item>
<string>ChargesRemainingInfo</string>
<ArrayOfString>
<string>Charges: {count}</string>
</ArrayOfString>
</Item>
<Item>
<string>CooldownInfo</string>
<ArrayOfString>
<string>Cooldown: {current}/{total}</string>
</ArrayOfString>
</Item>
<Item>
<string>MafiaWelcome</string>
<ArrayOfString>
Expand Down Expand Up @@ -137,10 +149,24 @@ Remaining Players:
<string>{nameSimple} votes for the murder of {toKill} ({count})!</string>
</ArrayOfString>
</Item>
<Item>
<string>DayRepeated</string>
<ArrayOfString>
<string>
<![CDATA[❔ It's Nig... Where are you? <b>Rabble-rouser</b> talks, you listen? OK, let's skip this night.]]>
</string>
</ArrayOfString>
</Item>
<Item>
<string>InactivePlayersKilled</string>
<ArrayOfString>
<string>Some players were inactive more than {limit} days and removed from game: {players}.</string>
</ArrayOfString>
</Item>
<Item>
<string>CheckStatus</string>
<ArrayOfString>
<string>{name}'s status — {role}.</string>
<string>{name}'s (`{nameSimple}'s`) status — {role}.</string>
</ArrayOfString>
</Item>
<Item>
Expand Down Expand Up @@ -235,6 +261,12 @@ Remaining Players:
<string>You are a fan of sunbeams, so peaceful that no one dares to raise his hand on you at night and applies his action to himself.</string>
</ArrayOfString>
</Item>
<Item>
<string>RoleHelp_RabbleRouser</string>
<ArrayOfString>
<string>You are a Rabble Rouser. Citizens can send victims to jail twice a day.</string>
</ArrayOfString>
</Item>
<Item>
<string>RoleHelp_Mafioso</string>
<ArrayOfString>
Expand All @@ -259,6 +291,12 @@ Remaining Players:
<string>On New Year's Eve you loved to blow firecrackers. Over time, this hobby turned into work.</string>
</ArrayOfString>
</Item>
<Item>
<string>RoleHelp_Hammerer</string>
<ArrayOfString>
<string>Your vote have double weight on **evening** **positive** (yes) voting.</string>
</ArrayOfString>
</Item>
<Item>
<string>RoleHelp_Yakuza</string>
<ArrayOfString>
Expand All @@ -277,6 +315,12 @@ Remaining Players:
<string>You are a horror, creeping on tiptoe of the night. Against you nothing can be done at night. And in the rest you are the same participant in the Japanese mafia, shoot innocents and mafia one by one.</string>
</ArrayOfString>
</Item>
<Item>
<string>RoleHelp_Kamikaze</string>
<ArrayOfString>
<string>You are so loyal to the yakuza that you are ready to sacrifice your life for its sake. Life is one, so once per game, of course.</string>
</ArrayOfString>
</Item>
<Item>
<string>RoleHelp_Maniac</string>
<ArrayOfString>
Expand All @@ -301,6 +345,12 @@ Remaining Players:
<string>You are a master of keyboard and mouse. Hack into the computers of players and tell everyone their statuses.</string>
</ArrayOfString>
</Item>
<Item>
<string>RoleHelp_Poisoner</string>
<ArrayOfString>
<string>You are a maniac chemist. Every day you can poison the water in the well of one of the citizens. Next day he will die.</string>
</ArrayOfString>
</Item>
<Item>
<string>GameStart_Role_Default</string>
<ArrayOfString>
Expand Down Expand Up @@ -451,6 +501,15 @@ Remaining Players:
</string>
</ArrayOfString>
</Item>
<Item>
<string>NightInfo_Kamikaze</string>
<ArrayOfString>
<string>
<![CDATA[What will be exploded tomorrow (with you)?
To kill the player, type <b>/kill X</b>, where <b>X</b> — number of the player. You can skip by <b>/skip</b>.]]>
</string>
</ArrayOfString>
</Item>
<Item>
<string>NightInfo_Maniac</string>
<ArrayOfString>
Expand Down Expand Up @@ -504,6 +563,23 @@ Remaining Players:
</string>
</ArrayOfString>
</Item>
<Item>
<string>DayInfo_RabbleRouser</string>
<ArrayOfString>
<string>
<![CDATA[You can start second day voting. To do this, type <b>/talk</b>.]]>
</string>
</ArrayOfString>
</Item>
<Item>
<string>DayInfo_Poisoner</string>
<ArrayOfString>
<string>
<![CDATA[Who will be poisoned today?
To kill the player, type <b>/kill X</b>, where <b>X</b> — number of the player.]]>
</string>
</ArrayOfString>
</Item>
<Item>
<string>EndNight</string>
<ArrayOfString>
Expand Down Expand Up @@ -668,6 +744,18 @@ Remaining Players:
<string>🛡 Yakuza wanted to make a sieve from a citizen, but he was the {role} and survived.</string>
</ArrayOfString>
</Item>
<Item>
<string>KamikazeKill</string>
<ArrayOfString>
<string>☠ Kamikaze killed {name}, who was the {role}.</string>
</ArrayOfString>
</Item>
<Item>
<string>KamikazeKillHimself</string>
<ArrayOfString>
<string>☠ {name} ({role}) has killed {gender:himself|herself}.</string>
</ArrayOfString>
</Item>
<Item>
<string>ComNoActive</string>
<ArrayOfString>
Expand Down Expand Up @@ -853,6 +941,18 @@ Remaining Players:
<string>👠 {name} ({role}) was dead from a deadly infection. Greetings from the Wench :)</string>
</ArrayOfString>
</Item>
<Item>
<string>PoisonerPoison</string>
<ArrayOfString>
<string>🤢 {role} was poisoned by the Poisoner.</string>
</ArrayOfString>
</Item>
<Item>
<string>PoisonerKill</string>
<ArrayOfString>
<string>🤢 {name} ({role}) died of poison.</string>
</ArrayOfString>
</Item>
<Item>
<string>ComKilled_ToSergeant</string>
<ArrayOfString>
Expand Down
6 changes: 6 additions & 0 deletions DiscordMafia/Config/Lang/en/modules.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,12 @@
<Summary>Assist in killing a player.</Summary>
</Info>
</Item>
<Item>
<string>talk</string>
<Info>
<Summary>Talk with players.</Summary>
</Info>
</Item>
<Item>
<string>curse</string>
<Info>
Expand Down
40 changes: 40 additions & 0 deletions DiscordMafia/Config/Lang/en/roles.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,16 @@
</NameCases>
</Info>
</Item>
<Item>
<string>Hammerer</string>
<Info>
<Name>Hammerer</Name>
<NameCases>
<string>hammerer</string>
<string>hammerer's</string>
</NameCases>
</Info>
</Item>
<Item>
<string>Highlander</string>
<Info>
Expand Down Expand Up @@ -100,6 +110,16 @@
</NameCases>
</Info>
</Item>
<Item>
<string>Kamikaze</string>
<Info>
<Name>Kamikaze</Name>
<NameCases>
<string>kamikaze</string>
<string>kamikaze's</string>
</NameCases>
</Info>
</Item>
<Item>
<string>Killer</string>
<Info>
Expand Down Expand Up @@ -160,6 +180,16 @@
</NameCases>
</Info>
</Item>
<Item>
<string>Poisoner</string>
<Info>
<Name>Poisoner</Name>
<NameCases>
<string>poisoner</string>
<string>poisoner's</string>
</NameCases>
</Info>
</Item>
<Item>
<string>Prosecutor</string>
<Info>
Expand All @@ -170,6 +200,16 @@
</NameCases>
</Info>
</Item>
<Item>
<string>RabbleRouser</string>
<Info>
<Name>Rabble-Rouser</Name>
<NameCases>
<string>rabble-rouser</string>
<string>rabble-rouser's</string>
</NameCases>
</Info>
</Item>
<Item>
<string>RobinHood</string>
<Info>
Expand Down
Loading

0 comments on commit 7f6efba

Please sign in to comment.