Skip to content

Commit

Permalink
feat: Add 4 more aspects (visuals and logic only)
Browse files Browse the repository at this point in the history
  • Loading branch information
garimitsu authored and PraxTube committed Jul 26, 2024
1 parent 7b06ddb commit ee64c8d
Show file tree
Hide file tree
Showing 10 changed files with 20 additions and 1 deletion.
Binary file added assets/aspects/anticipation_icon.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/aspects/envy_icon.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/aspects/forgiveness_icon.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/aspects/pride_icon.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 removed assets/aspects/vengfulness_icon.png
Binary file not shown.
1 change: 0 additions & 1 deletion assets/dialogue/aspects.yarn
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ Ima: A crucial Aspect for a Supreme Diviner.
Ima: It make the hardest challenges the greatest opportunities...
Ima: ...unless one starts relying on it more than needed.
Ima: There will be times when it evaporates, like morning dew on a hot day.
Ima: At such times, you'll need willpower.
Ami: There's no Aspect you won't find a negative downside to, is there?
Ima: Hmm? Do you see them all so unambiguous?
Ami: ...
Expand Down
4 changes: 4 additions & 0 deletions src/aspect/combiner.rs
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,10 @@ pub fn aspect_combinations(left_aspect: &Aspect, right_aspect: &Aspect) -> Aspec
(Aspect::Anger, Aspect::Fear) => Aspect::Hatred,
(Aspect::Anger, Aspect::Hatred) => Aspect::Vengefulness,
(Aspect::Joy, Aspect::Motivation) => Aspect::Elation,
(Aspect::Hatred, Aspect::Motivation) => Aspect::Pride,
(Aspect::Nostalgia, Aspect::Motivation) => Aspect::Anticipation,
(Aspect::Anger, Aspect::Pride) => Aspect::Envy,
(Aspect::Anticipation, Aspect::Elation) => Aspect::Forgiveness,
_ => Aspect::NotImplemented,
}
}
Expand Down
4 changes: 4 additions & 0 deletions src/aspect/icon.rs
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,10 @@ pub fn icon_texture(assets: &Res<GameAssets>, aspect: &Aspect) -> Handle<Image>
Aspect::Hatred => assets.hatred_icon.clone(),
Aspect::Vengefulness => assets.vengefulness_icon.clone(),
Aspect::Elation => assets.elation_icon.clone(),
Aspect::Anticipation => assets.anticipation_icon.clone(),
Aspect::Envy => assets.envy_icon.clone(),
Aspect::Pride => assets.pride_icon.clone(),
Aspect::Forgiveness => assets.forgiveness_icon.clone(),
Aspect::NotImplemented => assets.transparent_icon.clone(),
}
}
Expand Down
4 changes: 4 additions & 0 deletions src/aspect/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,10 @@ pub enum Aspect {
Hatred,
Vengefulness,
Elation,
Anticipation,
Envy,
Pride,
Forgiveness,
}

#[derive(Default, Component)]
Expand Down
8 changes: 8 additions & 0 deletions src/assets.rs
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,14 @@ pub struct GameAssets {
pub vengefulness_icon: Handle<Image>,
#[asset(path = "aspects/elation_icon.png")]
pub elation_icon: Handle<Image>,
#[asset(path = "aspects/anticipation_icon.png")]
pub anticipation_icon: Handle<Image>,
#[asset(path = "aspects/envy_icon.png")]
pub envy_icon: Handle<Image>,
#[asset(path = "aspects/pride_icon.png")]
pub pride_icon: Handle<Image>,
#[asset(path = "aspects/forgiveness_icon.png")]
pub forgiveness_icon: Handle<Image>,

// --- MAP ---
#[asset(path = "map/level.ldtk")]
Expand Down

0 comments on commit ee64c8d

Please sign in to comment.