Adding VN Character interface

This commit is contained in:
2022-12-18 13:48:43 -08:00
parent 1dbfd9f42e
commit 53ebbf0699
12 changed files with 93 additions and 26 deletions

View File

@ -25,7 +25,6 @@ add_subdirectory(scenes)
# Assets
tool_language(language_en locale/en.csv)
tool_language(language_fr locale/fr.csv)
tool_texture(texture_test texture_test.png)
tool_texture(texture_city_day borrowed/city_day.png)
tool_texture(texture_city_night borrowed/city_night.png)
@ -44,7 +43,6 @@ tool_truetype(truetype_ark
add_dependencies(${DAWN_TARGET_NAME}
language_en
language_fr
texture_test
tileset_penny
truetype_ark

View File

@ -7,6 +7,7 @@
#include "asset/AssetManager.hpp"
#include "poker/PokerPlayer.hpp"
#include "scene/components/Components.hpp"
#include "visualnovel/components/VisualNovelCharacter.hpp"
#include "display/animation/TiledSpriteAnimation.hpp"
namespace Dawn {
@ -31,6 +32,9 @@ namespace Dawn {
auto tiledSprite = item->addComponent<TiledSprite>();
auto animation = item->addComponent<AnimationController>();
auto pokerPlayer = item->addComponent<PokerPlayer>();
auto vnCharacter = item->addComponent<VisualNovelCharacter>();
vnCharacter->nameKey = "character.penny.name";
auto param = material->getShader()->getParameterByName("u_Text");
material->textureValues[param] = &textureAsset->texture;

View File

@ -41,10 +41,10 @@ namespace Dawn {
);
start
->then(new VisualNovelTextboxEvent(vnManager, "test"))
->then(new PokerNewGameEvent(vnManager))
->then(new VisualNovelTextboxEvent(vnManager, "test"))
->then(new PokerInitialEvent(vnManager))
->then(new VisualNovelTextboxEvent(vnManager, penny->getComponent<VisualNovelCharacter>(), "undefined"))
// ->then(new PokerNewGameEvent(vnManager))
->then(new VisualNovelTextboxEvent(vnManager, penny->getComponent<VisualNovelCharacter>(), "undefined"))
// ->then(new PokerInitialEvent(vnManager))
;
return start;

View File

@ -16,49 +16,49 @@ void PokerBetLoopEvent::onStart(IVisualNovelEvent *prev) {
auto betting = this->then(evt2);
betting
->whenEveryoneFolded(new VisualNovelTextboxEvent(this->manager, "Everyone Folded"))
// ->whenEveryoneFolded(new VisualNovelTextboxEvent(this->manager, "Everyone Folded"))
->then(new PokerWinnerEvent(this->manager))
->then(new PokerInitialEvent(this->manager))
;
betting
->whenBettingFinished(new VisualNovelTextboxEvent(this->manager, "Betting Finished"))
// ->whenBettingFinished(new VisualNovelTextboxEvent(this->manager, "Betting Finished"))
->then(new PokerWinnerEvent(this->manager))
->then(new PokerInitialEvent(this->manager))
;
betting
->whenTurn(new PokerTurnEvent(this->manager))
->then(new VisualNovelTextboxEvent(this->manager, "Turn Time"))
// ->then(new VisualNovelTextboxEvent(this->manager, "Turn Time"))
->then(new PokerNewBettingRoundEvent(this->manager))
->then(new PokerBetLoopEvent(this->manager))
;
betting
->whenHumanBet(new VisualNovelTextboxEvent(this->manager, "Human Bet"))
// ->whenHumanBet(new VisualNovelTextboxEvent(this->manager, "Human Bet"))
->then(new PokerBetLoopEvent(this->manager))
;
// AI Betting
auto aiBet = betting
->whenAiBet(new VisualNovelTextboxEvent(this->manager, "AI Bet"))
// ->whenAiBet(new VisualNovelTextboxEvent(this->manager, "AI Bet"))
->then(new PokerAIBetEvent(this->manager))
;
aiBet
->whenFolded(new VisualNovelTextboxEvent(this->manager, "Folded"))
// ->whenFolded(new VisualNovelTextboxEvent(this->manager, "Folded"))
->then(new PokerBetLoopEvent(this->manager))
;
aiBet
->whenAllIn(new VisualNovelTextboxEvent(this->manager, "All In"))
// ->whenAllIn(new VisualNovelTextboxEvent(this->manager, "All In"))
->then(new PokerBetLoopEvent(this->manager))
;
aiBet
->whenBetting(new VisualNovelTextboxEvent(this->manager, "Betting"))
// ->whenBetting(new VisualNovelTextboxEvent(this->manager, "Betting"))
->then(new PokerBetLoopEvent(this->manager))
;
aiBet
->whenCalling(new VisualNovelTextboxEvent(this->manager, "Calling"))
// ->whenCalling(new VisualNovelTextboxEvent(this->manager, "Calling"))
->then(new PokerBetLoopEvent(this->manager))
;
aiBet
->whenChecking(new VisualNovelTextboxEvent(this->manager, "Checking"))
// ->whenChecking(new VisualNovelTextboxEvent(this->manager, "Checking"))
->then(new PokerBetLoopEvent(this->manager))
;
}

View File

@ -20,11 +20,11 @@ namespace Dawn {
this
->then(new PokerNewRoundEvent(this->manager))
->then(new VisualNovelTextboxEvent(this->manager, "Round Started"))
// ->then(new VisualNovelTextboxEvent(this->manager, "Round Started"))
->then(new PokerTakeBlindsEvent(this->manager))
->then(new VisualNovelTextboxEvent(this->manager, "Blinds Taken"))
// ->then(new VisualNovelTextboxEvent(this->manager, "Blinds Taken"))
->then(new PokerDealEvent(this->manager))
->then(new VisualNovelTextboxEvent(this->manager, "Cards Dealt"))
// ->then(new VisualNovelTextboxEvent(this->manager, "Cards Dealt"))
->then(new PokerBetLoopEvent(this->manager))
;
}