Skip to content

Commit

Permalink
Merge pull request #9 from taz717/dev_taz_indians_page
Browse files Browse the repository at this point in the history
ESLint fix, add new civ banners and add Indians to website
  • Loading branch information
PF2K authored Sep 21, 2024
2 parents 5124ab9 + 35740e8 commit 0032b31
Show file tree
Hide file tree
Showing 45 changed files with 452 additions and 187 deletions.
7 changes: 7 additions & 0 deletions assets/data/civs.js
Original file line number Diff line number Diff line change
Expand Up @@ -47,5 +47,12 @@ export default {
"The Romans bring a new aspect to Age of Empires Online - Officers. Officers are powerful, semi-heroic Units that greatly impact battles and increase the effectiveness of your other Units. Having Officers in your army can quickly make the difference between a decisive victory and a crushing defeat. The Romans are fairly well-rounded, like their Greek counterparts, but are also generally more expensive and even more bottle-necked by their Economy. Utilize Roman Engineers to greatly speed up Building construction while your Villagers spend more time gathering resources rather than constructing Buildings.",
icon: require("~/assets/img/civ/roman.webp"),
character: require("~/assets/img/civ/roman_character.webp")
},
i: {
name: "Indians",
description:
"The Indians bring Choose-One Techs onto the battlefield, which is a unique mechanic that allows them to choose one of multiple powerful upgrades that can greatly improve their army and economy. They also have access to Gatherer Elephants - a specialist worker unit that gathers resources much faster than Villagers, but cannot repair any buildings and can only construct Plantations, which is a unique Indian Farm that can be utilized by more than one gatherer. In the lategame, you have access to Juggernauts which are extremely powerful but also extremely expensive armored Elephant units that can dominate any fight, but are very costly to replace if lost, and also vulnerable to enemy Priest units.",
icon: require("~/assets/img/civ/indian.webp"),
character: require("~/assets/img/civ/indian_character.webp")
}
}
98 changes: 59 additions & 39 deletions assets/data/personality_quiz_questions.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,10 @@
"e": 9,
"c": 8,
"p": 5,
"r": 8,
"r": 7,
"b": 1,
"n": 1
"n": 1,
"i": 3
}
},
{
Expand All @@ -22,21 +23,23 @@
"e": 6,
"c": 5,
"p": 4,
"r": 6,
"r": 3,
"b": 2,
"n": 1
"n": 2,
"i": 4
}
},
{
"title": "Very experienced",
"score": {
"g": 0,
"g": 1,
"e": 1,
"c": 2,
"p": 3,
"r": 5,
"p": 5,
"r": 3,
"b": 10,
"n": 10
"n": 10,
"i": 8
}
}
]
Expand All @@ -51,10 +54,11 @@
"g": 10,
"e": 8,
"c": 1,
"p": 7,
"p": 6,
"r": 8,
"b": 7,
"n": 1
"n": 1,
"i": 7
}
},
{
Expand All @@ -66,7 +70,8 @@
"p": 7,
"r": 3,
"b": 4,
"n": 10
"n": 10,
"i": 6
}
},
{
Expand All @@ -78,7 +83,8 @@
"p": 5,
"r": 1,
"b": 3,
"n": 10
"n": 10,
"i": 2
}
}
]
Expand All @@ -91,24 +97,26 @@
"title": "Military",
"score": {
"g": 7,
"e": 7,
"e": 6,
"c": 8,
"p": 7,
"r": 10,
"b": 6,
"n": 9
"n": 9,
"i": 7
}
},
{
"title": "Economy",
"score": {
"g": 4,
"e": 9,
"e": 8,
"c": 4,
"p": 8,
"p": 7,
"r": 2,
"b": 10,
"n": 4
"n": 4,
"i": 6
}
},
{
Expand All @@ -119,8 +127,9 @@
"c": 2,
"p": 6,
"r": 4,
"b": 10,
"n": 2
"b": 8,
"n": 2,
"i": 10
}
}
]
Expand All @@ -133,24 +142,26 @@
"title": "Advanced Siege engines and slower moving units with a tankline in front.",
"score": {
"g": 9,
"e": 8,
"e": 7,
"c": 2,
"p": 8,
"p": 7,
"r": 10,
"b": 8,
"n": 2
"n": 2,
"i": 4
}
},
{
"title": "Lots of Cavalry and other mounted units.",
"score": {
"g": 1,
"g": 3,
"e": 7,
"c": 4,
"p": 10,
"p": 9,
"r": 5,
"b": 8,
"n": 4
"n": 6,
"i": 10
}
},
{
Expand All @@ -159,22 +170,24 @@
"g": 9,
"e": 2,
"c": 8,
"p": 10,
"p": 9,
"r": 4,
"b": 2,
"n": 2
"n": 3,
"i": 5
}
},
{
"title": "Priests to convert enemy units and a tankline to protect them.",
"score": {
"g": 2,
"g": 3,
"e": 8,
"c": 2,
"p": 7,
"p": 6,
"r": 5,
"b": 7,
"n": 2
"b": 8,
"n": 2,
"i": 5
}
},
{
Expand All @@ -184,9 +197,10 @@
"e": 7,
"c": 10,
"p": 6,
"r": 4,
"r": 8,
"b": 2,
"n": 10
"n": 8,
"i": 5
}
}
]
Expand All @@ -204,7 +218,8 @@
"p": 8,
"r": 10,
"b": 7,
"n": 8
"n": 8,
"i": 10
}
},
{
Expand All @@ -216,7 +231,8 @@
"p": 7,
"r": 1,
"b": 10,
"n": 3
"n": 3,
"i": 1
}
},
{
Expand All @@ -228,7 +244,8 @@
"p": 8,
"r": 1,
"b": 4,
"n": 4
"n": 4,
"i": 4
}
}
]
Expand All @@ -246,7 +263,8 @@
"p": 8,
"r": 7,
"b": 9,
"n": 10
"n": 10,
"i": 10
}
},
{
Expand All @@ -258,7 +276,8 @@
"p": 2,
"r": 3,
"b": 1,
"n": 5
"n": 5,
"i": 5
}
},
{
Expand All @@ -270,7 +289,8 @@
"p": 6,
"r": 5,
"b": 1,
"n": 1
"n": 1,
"i": 1
}
}
]
Expand Down
Binary file modified assets/img/civ/babylon/civ.webp
Binary file not shown.
File renamed without changes
Binary file added assets/img/civ/babylon/legacy/civ.webp
Binary file not shown.
Binary file modified assets/img/civ/celt/civ.webp
Binary file not shown.
File renamed without changes
Binary file added assets/img/civ/celt/legacy/civ.webp
Binary file not shown.
Binary file modified assets/img/civ/egypt/civ.webp
Binary file not shown.
File renamed without changes
Binary file added assets/img/civ/egypt/legacy/civ.webp
Binary file not shown.
Binary file modified assets/img/civ/greek/civ.webp
Binary file not shown.
File renamed without changes
Binary file added assets/img/civ/greek/legacy/civ.webp
Binary file not shown.
Binary file added assets/img/civ/indian.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/img/civ/indian.webp
Binary file not shown.
Binary file added assets/img/civ/indian_character.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/img/civ/indian_character.webp
Binary file not shown.
Binary file added assets/img/civ/indians/BladeChariot_Normal.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/img/civ/indians/GadaWarrior_Normal.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/img/civ/indians/Juggernaut_Normal.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/img/civ/indians/civ.webp
Binary file not shown.
Binary file modified assets/img/civ/norse.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/img/civ/norse.webp
Binary file not shown.
Binary file modified assets/img/civ/norse/civ.webp
Binary file not shown.
File renamed without changes
Binary file added assets/img/civ/norse/legacy/civ.webp
Binary file not shown.
Binary file modified assets/img/civ/persia/civ.webp
Binary file not shown.
File renamed without changes
Binary file added assets/img/civ/persia/legacy/civ.webp
Binary file not shown.
Binary file modified assets/img/civ/roman/civ.webp
Binary file not shown.
File renamed without changes
Binary file added assets/img/civ/roman/legacy/civ.webp
Binary file not shown.
17 changes: 10 additions & 7 deletions components/Civilization.vue
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
<h3 class="subtitle has-text-grey-lighter has-text-centered">
{{ subtitle }}
</h3>
<!-- New layout later when wider screenshots are provided -->
<div class="civ-img" :style="{ backgroundImage: `url(${img})` }" />

<div class="columns">
<div class="column is-flex is-flex-column">
Expand Down Expand Up @@ -38,9 +40,9 @@
</div>
</div>
<div class="column is-narrow">
<div class="civ-img">
<!-- <div class="civ-img">
<img class="bordered" :src="img" />
</div>
</div> -->

<h5 class="title is-5 has-text-white has-text-centered">
Key Units
Expand Down Expand Up @@ -95,10 +97,11 @@ export default {
.civ-img {
margin-bottom: 0.75rem;
text-align: center;
img {
width: 251px;
height: 135px;
}
width: 100%;
height: 132px;
border: 2px solid #afa588;
border-radius: 7px;
background-size: cover;
background-position: 10%;
}
</style>
4 changes: 4 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions pages/civilizations.vue
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,16 @@
<span>Norse</span>
</nuxt-link>
</li>
<li>
<nuxt-link
to="/civilizations/indians"
exact-active-class="is-active"
class="is-flex is-flex-column is-centered"
>
<img src="~/assets/img/civ/indian.webp" class="civ-icon" />
<span>Indians</span>
</nuxt-link>
</li>
</ul>
</div>
<nuxt-child />
Expand Down
Loading

0 comments on commit 0032b31

Please sign in to comment.