From 3090b5e1dc6b6cf12701012c5b2e014f5222ec6a Mon Sep 17 00:00:00 2001 From: Dominic Masters Date: Wed, 1 Feb 2023 07:26:55 -0800 Subject: [PATCH] Script first pass --- assets/games/pokergame/locale/en.csv | 57 +++++++++++++++++- assets/games/pokergame/scripty.docx | Bin 0 -> 13586 bytes .../VisualNovelTransformItemEvent.cpp | 7 ++- src/dawnpokergame/scenes/Scene_1.hpp | 5 +- 4 files changed, 64 insertions(+), 5 deletions(-) create mode 100644 assets/games/pokergame/scripty.docx diff --git a/assets/games/pokergame/locale/en.csv b/assets/games/pokergame/locale/en.csv index 1b8b6cbb..f791a745 100644 --- a/assets/games/pokergame/locale/en.csv +++ b/assets/games/pokergame/locale/en.csv @@ -2,7 +2,59 @@ undefined,UNDEFINED hello.world,Hello World! character.death.name,"Santa Muerte" character.penny.name,Penny -scene.1.1,"This is the scene to explain that you're dead, lmao" + +scene.1.1,"...Huh? Where am I?" +scene.1.2,"Relax child, come forward, it is time." +scene.1.3,"Who said that? Where is that voice coming from?" +scene.1.4,"Hello, and welcome to the other side wanderer." +scene.1.5,"Other side? Wait that robe! You don't mean?" +scene.1.6,"Yeah let's speed things up here a bit. Normally I go on script but short on time right now unfortunately." +scene.1.7,"You died, dead, passed on, kaput. This is the space between spaces. You may be going up, you may be going down, that's not my choice, I'm just here to guide you." +scene.1.8,"...Are you?" +scene.1.9,"Yes, some call me the Grim Reaper, some Muerte, and a long time ago it was Torva messor." +scene.1.10,"Nowadays most people others just call me Death, but I prefer Nami, short for Izanami." +scene.1.11,"Truth be told I am not the reason you are here, I am just here to guide you, don't know why I keep getting lumped with this bad reputation of killing people." +scene.1.12,"Wait, so I am dead? For real? This has to be some kind of misunderstanding-wait I must be dreaming, that's it." +scene.1.121,"Oh no this can't be happening, this can't be real..." +scene.1.13,"If I had a penny for every time... +No, don't get it wrong, you are meant to be here." +scene.1.131,"I can't be.. you gotta send me back! How did I die?" +scene.1.132,"I don't know. Regardless, I can't send you back to your world. We are getting off topic anyway." +scene.1.133,"What?" +scene.1.134,"*ahem* I have a request of you child." +scene.1.14,"Me? Help you? Unless you're taking me back to my home I don't think you can convince me to help the likes of you." +scene.1.141,"Yes... See, normally I'd just take you to Charon. It is his role to take the newcomers where they need to go." +scene.1.142,"You know how it goes, I introduce you to Charon, you pay a coin, jump on a boat, and then you're not my problem any more." +scene.1.15,"You mean send me down the river styx? You're not helping your case." +scene.1.16,"Yes, well I would normally do that, but at the moment I have a bit of a problem with capacity." +scene.1.17,"Capacity? What kind of capacity issue?" +scene.1.18,"I manage a few worlds, not just the one that you come from." +scene.1.19,"In your world, people rely on technology and their own ability to progress civilization." +scene.1.20,"In another world, I manage people who raise and tame small pocket sized creatures with different abilities to progress their civilization." +scene.1.21,"But one world I manage has been having some real troubles lately." +scene.1.22,"This world contains humans alongside other intelligent creatures and species. They would be analagous to the medieval times in your world." +scene.1.23,"So far they have managed to keep a good balance by having some creatures weild weapons, and some use magical powers." +scene.1.24,"But lately there has been more cases of stronger creatures killing off the human population." +scene.1.25,"It's causing me to work overtime just to make sure I can get everyone where they need to go." +scene.1.26,"You have to work overtime?" +scene.1.27,"The benefits here are really good, my union gives us time and a half for overtime we do." +scene.1.28,"Death has unionized? That sounds horrible." +scene.1.29,"Yes I did, and please just call me Nami. My union is starting to threaten a strike and I need to try and prevent that." +scene.1.30,"I haven't been on strike since the 1940's when we had our last capacity issue." +scene.1.31,"The union negotiated a great dental plan after that. But we need to try and avoid striking this time." +scene.1.32,"Okay but I don't know how you think I can help." +scene.1.33,"It's easy. Now understand that I cannot send you back to your world, that is out of my control." +scene.1.34,"But there are no rules about you being sent to another world." +scene.1.35,"So, I send you to the medieval world, you get another crack at life and perhaps you can assist me in finding out how to stop all the deaths." +scene.1.36,"So, Nami, you want me to go to a world I don't know, that has monsters and a problem with lots of death, stuck in the medieval times, just to help out literal death?" +scene.1.37,"Not to mention I won't know anyone, I won't understand their language and don't know their culture." +scene.1.38,"I'll put it bluntly Nami, it sounds like I would be signing up for a short, miserable, lonely life, just for a chance to help you out." +scene.1.39,"That's great, thanks for offering to help out!" +scene.1.40,"I don't have a choice do I?" +scene.1.41,"No, besides we have already started. Now, stand still and take a deep breath I am going to send you over to the other world now." +scene.1.42,"I feel really tired all of a sudden... Wait does the Grim Reaper even have any kind of powers?" +scene.1.43,"Of course I do, now open your eyes..." + scene.2.1,"This scene has you waking in the new world" scene.3.1,"This is the scene to prep you for the first game" scene.4.1,"First Poker Game with friendlies" @@ -27,7 +79,8 @@ scene.20.1,"King Arrival, Everyone's annoyed" scene.21.1,"King in the bar, running his mouth" scene.22.1,"King Fight" scene.23.1,"Post King Fight, angry he leaves, town rallies around you" -scene.24.1,"Go to one of the kingsmen who's working with the big bad, he's worried that the townspeople know more than they let on." +scene.24.1," Go to one of the kingsmen who's working with the big bad, he's worried that the townspeople know more than they let on." unknown3,"Something here has to bring the big bad to town." +unknown4,"It's revealed that death knows the big bad", test.1,"Test" test.2,"Test*" \ No newline at end of file diff --git a/assets/games/pokergame/scripty.docx b/assets/games/pokergame/scripty.docx new file mode 100644 index 0000000000000000000000000000000000000000..dd5ab52469d95af6e6ae6b30d34893bf8f269a4f GIT binary patch literal 13586 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 t5__REQx`r>*y#r5|EFjcI7+eQD%(#fZhDX1TI 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 literal 0 HcmV?d00001 diff --git a/src/dawn/visualnovel/events/characters/VisualNovelTransformItemEvent.cpp b/src/dawn/visualnovel/events/characters/VisualNovelTransformItemEvent.cpp index 877201e0..d122ea1d 100644 --- a/src/dawn/visualnovel/events/characters/VisualNovelTransformItemEvent.cpp +++ b/src/dawn/visualnovel/events/characters/VisualNovelTransformItemEvent.cpp @@ -21,7 +21,9 @@ VisualNovelTransformItemEvent::VisualNovelTransformItemEvent( this->callbackAnimation.setCallback( &item->transform, &Transform::setLocalPosition ); - this->callbackAnimation.addKeyframe(0.0f, start); + if(duration != 0) { + this->callbackAnimation.addKeyframe(0.0f, start); + } this->callbackAnimation.addKeyframe(duration, end); } @@ -38,7 +40,8 @@ VisualNovelTransformItemEvent::VisualNovelTransformItemEvent( this->callbackAnimation.setCallback( &item->transform, &Transform::setLocalPosition ); - this->relative = true; + + if(duration != 0) this->relative = true; this->callbackAnimation.addKeyframe(duration, end); } diff --git a/src/dawnpokergame/scenes/Scene_1.hpp b/src/dawnpokergame/scenes/Scene_1.hpp index ec08222f..541f14d9 100644 --- a/src/dawnpokergame/scenes/Scene_1.hpp +++ b/src/dawnpokergame/scenes/Scene_1.hpp @@ -19,6 +19,8 @@ namespace Dawn { void vnStage() override { this->death = DeathPrefab::create(this); + this->death->material->color.a = 0; + // this->death->transform.setLocalPosition(glm::vec3(-100, 0, 0)); } void onSceneEnded() { @@ -48,9 +50,10 @@ namespace Dawn { auto start = new VisualNovelPauseEvent(vnManager, 0.1f); start ->then(new VisualNovelTextboxEvent(vnManager, this->death->vnCharacter, this->death->emotionHappy, "scene.1.1")) + ->then(new VisualNovelFadeCharacterEvent(vnManager, this->death->vnCharacter, true, &easeOutQuad, 1.0f)) // ->then(new VisualNovelCallbackEvent(vnManager, this, &Scene_1::onSceneEnded)) ; return start; - } + } }; } \ No newline at end of file