Skip to content

Commit

Permalink
Feature/remove initiate situation (#522)
Browse files Browse the repository at this point in the history
* Remove the initiate situation action

* Clean up remaining traces of initiate situation

* Update terms and action logs
  • Loading branch information
iamlogand authored Oct 10, 2024
1 parent 5fc1361 commit dc39c1a
Show file tree
Hide file tree
Showing 20 changed files with 207 additions and 129 deletions.
2 changes: 1 addition & 1 deletion backend/.vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"configurations": [
{
"name": "Python: Django",
"type": "python",
"type": "debugpy",
"request": "launch",
"program": "${workspaceFolder}\\manage.py",
"args": ["runserver"],
Expand Down
2 changes: 2 additions & 0 deletions frontend/componentTables/termComponents.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ import ShipBuildingTerm from "@/components/terms/ShipBuilding"
import ArmamentsTerm from "@/components/terms/ArmamentsTerm"
import GrainTerm from "@/components/terms/GrainTerm"
import PersonalRevenueTerm from "@/components/terms/PersonalRevenue"
import EventTerm from "@/components/terms/Event"

interface TermComponents {
[key: string]: JSX.Element
Expand Down Expand Up @@ -80,6 +81,7 @@ const termComponents: TermComponents = {
Popularity: <PopularityTerm />,
"Population Phase": <PopulationPhaseTerm />,
"Prior Consul": <PriorConsulTerm />,
Event: <EventTerm />,
"Revenue Phase": <RevenuePhaseTerm />,
"Revolution Phase": <RevolutionPhaseTerm />,
"Rome Consul": <RomeConsulTerm />,
Expand Down
6 changes: 4 additions & 2 deletions frontend/components/SenatorListItem.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -168,10 +168,12 @@ const SenatorListItem = ({ senator, ...props }: SenatorListItemProps) => {
includeIcon
hiddenUnderline
/>{" "}
{factionLeader && "Leader"}
{factionLeader && (
<TermLink name="Faction Leader" displayName="Leader" hiddenUnderline />
)}
</div>
) : (
factionLeader && <span>Faction Leader</span>
factionLeader && <TermLink name="Faction Leader" hiddenUnderline />
)
) : senator.alive ? (
<TermLink name="Unaligned" hiddenUnderline />
Expand Down
8 changes: 4 additions & 4 deletions frontend/components/actionLogs/EraEndsActionLog.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ const EraEndsActionLog = ({ notification }: ActionLogProps) => {
return (
<ActionLogLayout actionLog={notification} icon={getIcon()} title="Era Ends">
<p>
The last Situation has been initiated, marking the end of the Early
Republic Era. Once the <TermLink name="Final Forum Phase" /> is over,
the game will end, and the <TermLink name="Faction" /> with the most{" "}
<TermLink name="Influence" /> will win.
The last <TermLink name="Event" /> has occurred, marking the end of the
Early Republic Era. Once the <TermLink name="Final Forum Phase" /> is
over, the game will end, and the <TermLink name="Faction" /> with the
most <TermLink name="Influence" /> will win.
</p>
</ActionLogLayout>
)
Expand Down
4 changes: 0 additions & 4 deletions frontend/components/actionLogs/NewEnemyLeaderActionLog.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,6 @@ const NewEnemyLeaderActionLog = ({ notification }: ActionLogProps) => {
) : (
"He is idle for now"
)}
.{" "}
<i>
Initiated by <FactionLink faction={initiatingFaction} />
</i>
.
</p>
</ActionLogLayout>
Expand Down
6 changes: 1 addition & 5 deletions frontend/components/actionLogs/NewFamilyActionLog.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,7 @@ const NewFamilyActionLog = ({
>
<p>
<SenatorLink senator={newSenator} /> {senatorDetails ? "" : "has "}
joined the Senate as an <TermLink name="Unaligned Senator" />.{" "}
<i>
Initiated by <FactionLink faction={initiatingFaction} />
</i>
.
joined the Senate as an <TermLink name="Unaligned Senator" />.
</p>
</ActionLogLayout>
)
Expand Down
6 changes: 1 addition & 5 deletions frontend/components/actionLogs/NewWarActionLog.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -101,11 +101,7 @@ const NewWarActionLog = ({ notification }: ActionLogProps) => {
>
<p>
Rome faces a new threat in the <FormattedWarName war={newWar} />. This{" "}
<TermLink name="War" /> is {getStatusAndExplanation()}.{" "}
<i>
Initiated by <FactionLink faction={initiatingFaction} />
</i>
.
<TermLink name="War" /> is {getStatusAndExplanation()}.
</p>
</ActionLogLayout>
)
Expand Down
3 changes: 2 additions & 1 deletion frontend/components/terms/ArmamentsTerm.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@ const ArmamentsTerm = () => (
liable to a Minor Corruption Prosecution.
</p>
<p>
Armaments has a chance of being destroyed by a Natural Disaster Event.
Armaments has a chance of being destroyed by a Natural Disaster{" "}
<TermLink name="Event" />.
</p>
</TermLayout>
)
Expand Down
5 changes: 3 additions & 2 deletions frontend/components/terms/EnemyLeaderTerm.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,9 @@ const EnemyLeaderTerm = () => (
specific series of Wars or an individual War.
</p>
<p>
The appearance of a new Enemy Leader is one of several possible Situations
that can be initiated during the <TermLink name="Forum Phase" />.
The appearance of a new Enemy Leader is one of several possible{" "}
<TermLink name="Event" plural /> that can be initiated during the{" "}
<TermLink name="Forum Phase" />.
</p>
<p>
If there are no{" "}
Expand Down
67 changes: 67 additions & 0 deletions frontend/components/terms/Event.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
import Image from "next/image"
import { Avatar } from "@mui/material"
import TaxFarmerIcon from "@/images/icons/taxFarmer.svg"
import TermLayout from "@/components/TermLayout"
import TermLink from "@/components/TermLink"

// Description of the game term: Event
const HarborFeesTerm = () => (
<TermLayout
title="Event"
icon={
<Avatar sx={{ height: 56, width: 56 }}>
<Image
src={TaxFarmerIcon}
height={44}
width={44}
alt="Random event icon"
/>
</Avatar>
}
>
<p>
An <b>Event</b> is a random occurrence that happens at the beginning of a{" "}
<TermLink name="Faction" displayName="Faction's" /> initiative during the{" "}
<TermLink name="Forum Phase" />. Only the Fates hold the answers to what
comes next, but the possibilities are confined to the following:
</p>
<h5 className="mt-3 font-bold">Common Events</h5>
<ul>
<li>
New <TermLink name="Enemy Leader" />
</li>
<li>
New <TermLink name="Family" />
</li>
<li>
New <TermLink name="Secret" /> (gained by the initiating Faction)
</li>
<li>
New <TermLink name="War" />
</li>
</ul>
<h5 className="mt-3 font-bold">Rare Events</h5>
<ul>
<li>Allied Enthusiasm</li>
<li>Ally Deserts</li>
<li>Barbarian Raids</li>
<li>Enemy Ally Deserts</li>
<li>Enemy Leader Dies</li>
<li>Epidemic</li>
<li>Evil Omens</li>
<li>Famine</li>
<li>Internal Disorder</li>
<li>Manpower Shortage</li>
<li>Natural Disaster</li>
<li>New Alliance</li>
<li>Mob Violence</li>
<li>Pretender</li>
<li>Refuge</li>
<li>Rhodian Alliance</li>
<li>Storm at Sea</li>
<li>Trial of Verres</li>
</ul>
</TermLayout>
)

export default HarborFeesTerm
5 changes: 5 additions & 0 deletions frontend/components/terms/FamilyTerm.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,11 @@ const FamilyTerm = () => (
<TermLink name="Statesman" displayName="Statesmen" />, each of whom is a
member of a Family.
</p>
<p>
The appearance of a new Family Senator is one of several possible{" "}
<TermLink name="Event" plural /> that can occur during the{" "}
<TermLink name="Forum Phase" />.
</p>
<p>
Each Family Senator is associated with one of the 3 Scenarios. Each
Scenario features Family Senators associated with that scenario, as well
Expand Down
8 changes: 4 additions & 4 deletions frontend/components/terms/FinalForumPhaseTerm.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ const FinalForumPhaseTerm = () => (
>
<p>
After playing the game for several Turns, during the{" "}
<TermLink name="Forum Phase" />, the final Situation will be initiated. At
that point the Phase becomes known as the <b>Final Forum Phase</b>. The
mechanics are the same as a regular Forum Phase, but Persuasion Attempts
are less likely to succeed.
<TermLink name="Forum Phase" />, the final Common{" "}
<TermLink name="Event" /> will occur. At that point the Phase becomes
known as the <b>Final Forum Phase</b>. The mechanics are the same as a
regular Forum Phase, but Persuasion Attempts are less likely to succeed.
</p>
<p>
At the end of the Final Forum Phase, the <TermLink name="Faction" /> with
Expand Down
8 changes: 5 additions & 3 deletions frontend/components/terms/ForumPhaseTerm.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,18 @@ const ForumPhaseTerm = () => (
/>
<p>
The <b>Forum Phase</b> is the 3rd phase of a <TermLink name="Turn" />.
During this phase, 6 Initiatives must be taken, beginning with the{" "}
During this phase, 6 initiatives must be taken, beginning with the{" "}
<TermLink name="HRAO" />
&apos;s <TermLink name="Faction" /> and proceeding in Chromatic Order.
Once all Factions have taken an Initiative, any remaining Initiatives are
Once all Factions have taken an initiative, any remaining initiatives are
Auctioned.
</p>
<h5 className="mt-3 font-bold">Initiative Sequence</h5>
<p>The initiative sequence consists of the following steps:</p>
<ol className="flex flex-col gap-2">
<li>Initiate a Situation</li>
<li>
An <TermLink name="Event" /> occurs
</li>
<li>Make a Persuasion Attempt</li>
<li>Attempt to Attract a Knight or Pressure Knights</li>
<li>Sponsor Games</li>
Expand Down
3 changes: 2 additions & 1 deletion frontend/components/terms/HarborFees.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@ const HarborFeesTerm = () => (
Senator becomes liable to a Minor Corruption Prosecution.
</p>
<p>
Harbor Fees has a chance of being destroyed by a Natural Disaster Event.
Harbor Fees has a chance of being destroyed by a Natural Disaster{" "}
<TermLink name="Event" />.
</p>
</TermLayout>
)
Expand Down
2 changes: 1 addition & 1 deletion frontend/components/terms/InactiveWarTerm.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ const InactiveWarTerm = () => (
<p>
Inactive Wars will develop to an{" "}
<TermLink name="Active War" displayName="Active" /> state upon the
appearance of a{" "}
appearance of{" "}
<TermLink
name="Matching Wars and Enemy Leaders"
displayName="Matching War or Enemy Leader"
Expand Down
5 changes: 4 additions & 1 deletion frontend/components/terms/Mining.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,10 @@ const MiningTerm = () => (
<TermLink name="Personal Revenue" />. Upon receiving this revenue, the
Senator becomes liable to a Minor Corruption Prosecution.
</p>
<p>Mining has a chance of being destroyed by a Natural Disaster Event.</p>
<p>
Mining has a chance of being destroyed by a Natural Disaster{" "}
<TermLink name="Event" />.
</p>
</TermLayout>
)

Expand Down
5 changes: 5 additions & 0 deletions frontend/components/terms/SecretTerm.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,11 @@ const SecretTerm = () => (
<TermLink name="Faction" /> that can be revealed to give the Faction an
advantage. Each Secret can only be revealed once.
</p>
<p>
The gaining of a new Secret is one of several possible{" "}
<TermLink name="Event" plural /> that can occur during the{" "}
<TermLink name="Forum Phase" />.
</p>
<p>There are 3 categories of Secrets:</p>
<ul className="mt-0 flex flex-col gap-4">
<li>
Expand Down
3 changes: 2 additions & 1 deletion frontend/components/terms/ShipBuilding.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@ const ShipBuildingTerm = () => (
liable to a Minor Corruption Prosecution.
</p>
<p>
Ship Building has a chance of being destroyed by a Natural Disaster Event.
Ship Building has a chance of being destroyed by a Natural Disaster{" "}
<TermLink name="Event" />.
</p>
</TermLayout>
)
Expand Down
7 changes: 4 additions & 3 deletions frontend/components/terms/WarTerm.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,9 @@ const WarTerm = () => (
<TermLink name="Combat Phase" />, Rome is defeated and all players lose.
</p>
<p>
The appearance of a new War is one of several possible Situations that can
be initiated during the <TermLink name="Forum Phase" />.
The appearance of a new War is one of several possible{" "}
<TermLink name="Event" plural /> that can occur during the{" "}
<TermLink name="Forum Phase" />.
</p>
<p>
During the <TermLink name="Senate Phase" />, Rome can raise and deploy
Expand All @@ -41,7 +42,7 @@ const WarTerm = () => (
<h5 className="mt-3 font-bold">Activation</h5>
<p>
Some Wars are inherently Active, while others will become Active due to
the appearance of a <TermLink name="Matching Wars and Enemy Leaders" />.
the appearance of <TermLink name="Matching Wars and Enemy Leaders" />.
</p>
<p>
Rome can prosecute Inactive and Imminent Wars, but this will immediately
Expand Down
Loading

0 comments on commit dc39c1a

Please sign in to comment.