Initial craft of an item now properly consumes the resources and money of the item. Start at Story I node instead of the Campaign I-I node. Include additional credits. Added additional story background. Release Build 7877. Patch version 0.4.3

pull/35/head
sigonasr2 9 months ago
parent 79d50fdf96
commit a9a640be82
  1. 2
      Adventures in Lestoria/AdventuresInLestoria.cpp
  2. 8
      Adventures in Lestoria/CraftItemWindow.cpp
  3. 4
      Adventures in Lestoria/State_OverworldMap.cpp
  4. 8
      Adventures in Lestoria/TODO.txt
  5. 4
      Adventures in Lestoria/Version.h
  6. 75
      Adventures in Lestoria/assets/config/credits.txt
  7. 3
      Adventures in Lestoria/assets/config/levels.txt
  8. 4
      Adventures in Lestoria/assets/config/story/Chapter 1.txt
  9. BIN
      Adventures in Lestoria/assets/gamepack.pak
  10. BIN
      x64/Release/Adventures in Lestoria.exe

@ -317,6 +317,8 @@ bool AiL::OnUserCreate(){
GameSettings::Initialize();
#endif
State_OverworldMap::SetStageMarker("starting_map_name"_S);
utils::datafile::INITIAL_SETUP_COMPLETE=true;
ValidateGameStatus(); //Checks to make sure everything has been initialized properly.

@ -63,6 +63,14 @@ void Menu::InitializeCraftItemWindow(){
item=Inventory::AddItem(item.lock()->ActualName());
Component<EnhancementStatsLabel>(CRAFT_ITEM,"Enhancement Stats Label")->SetItem(item);
Component<RequiredMaterialsList>(CRAFT_ITEM,"Required Materials List")->SetItem(item); //Update the item refs in the enhancement level screen to now display the correct item.
const CraftingRequirement&consumedResources=item.lock()->GetEnhancementInfo()[item.lock()->EnhancementLevel()].craftingRequirement;
for(const auto&[name,amt]:consumedResources.GetItems()){
Inventory::RemoveItem(Inventory::GetItem(name)[0],amt);
}
game->GetPlayer()->SetMoney(game->GetPlayer()->GetMoney()-consumedResources.GetCost());
Inventory::UpdateBlacksmithInventoryLists();
SoundEffect::PlaySFX("Craft Equip",SoundEffect::CENTERED);
}else{ //Since we already own this equipment, just enhance it.

@ -56,9 +56,7 @@ INCLUDE_GFX
std::vector<ConnectionPoint>State_OverworldMap::connections;
ConnectionPoint*State_OverworldMap::currentConnectionPoint=nullptr;
State_OverworldMap::State_OverworldMap(){
SetStageMarker("Stage I-I"); //Eventually we will load the game from a file and this will not be necessary. We just set it to this for now.
}
State_OverworldMap::State_OverworldMap(){}
void State_OverworldMap::OnStateChange(GameState*prevState){
Component<MenuComponent>(MenuType::PAUSE,"Return to Camp Button")->SetGrayedOut(false);
SaveFile::SaveGame();

@ -28,10 +28,4 @@ Materials for initial craft seems to be wrong? need to recheck
do we need a minimap? (maybe with fog of war?) Maybe polling that once testing with more people.
should gemstones dropp from boss stages aswell? (Maybe lower droprate?)
chasing blue slime as warrior aint no fun, nerf there move spd (-5% maybe?)
feature to lock accesoires to protect them from selling would be nice
Gorbit99's viewport PGEX
Original Nico Sprite
Initial Gold Crafting costs does not get subtracted properly.
Menu controls are not properly saved in system settings (only for emscripten?)
feature to lock accesoires to protect them from selling would be nice

@ -38,8 +38,8 @@ All rights reserved.
#pragma once
#define VERSION_MAJOR 0
#define VERSION_MINOR 4
#define VERSION_PATCH 2
#define VERSION_BUILD 7872
#define VERSION_PATCH 3
#define VERSION_BUILD 7877
#define stringify(a) stringify_(a)
#define stringify_(a) #a

@ -20,43 +20,48 @@ Credits
LINE[17]=" "
LINE[18]="olcPGEX_MiniAudio Copyright© 2024 by Moros Smith under the OLC-3 License"
LINE[19]=" "
LINE[20]="miniaudio library Copyright© 2024 by David Reid under the MIT No Attribution License"
LINE[21]="Ogg Vorbis audio decoder - v1.22 - public domain http://nothings.org/stb_vorbis/"
LINE[22]=" "
LINE[23]="Portions of this software are copyright © 2024 The FreeType Project (www.freetype.org). All rights reserved."
LINE[20]="olcPGEX_ViewPort by Gorbit99"
LINE[21]=" "
LINE[22]="miniaudio library Copyright© 2024 by David Reid under the MIT No Attribution License"
LINE[23]="Ogg Vorbis audio decoder - v1.22 - public domain http://nothings.org/stb_vorbis/"
LINE[24]=" "
LINE[25]="Assets"
LINE[26]="~~~~~~~~~~~~~~~~"
LINE[27]="ERA OF FANTASY - GRASSLANDS"
LINE[28]="X: @Namatnieks"
LINE[29]=" "
LINE[30]="*** Minifantasy - Tiny Overworld v1.0 ***"
LINE[31]="Minifantasy is an original idea by Krishna Palacio"
LINE[32]=" "
LINE[33]="Public Domain Font Authors"
LINE[34]="c64esque by andraaspar"
LINE[35]="Habbo by Omni"
LINE[36]="Unknown by Anonymous"
LINE[25]="Portions of this software are copyright © 2024 The FreeType Project (www.freetype.org). All rights reserved."
LINE[26]=" "
LINE[27]="Assets"
LINE[28]="~~~~~~~~~~~~~~~~"
LINE[29]="Pokemon-based Nico Yazawa sprite that started it all..."
LINE[30]="DeviantArt: @kirbysmith"
LINE[31]=""
LINE[32]="ERA OF FANTASY - GRASSLANDS"
LINE[33]="X: @Namatnieks"
LINE[34]=" "
LINE[35]="*** Minifantasy - Tiny Overworld v1.0 ***"
LINE[36]="Minifantasy is an original idea by Krishna Palacio"
LINE[37]=" "
LINE[38]="Nb Pixel Font Bundle"
LINE[39]="Nb Pixel Font Bundle 2"
LINE[40]=" "
LINE[41]=" "
LINE[42]="Game License"
LINE[43]="~~~~~~~~~~~~~~~~"
LINE[44]="License (OLC-3)"
LINE[45]="~~~~~~~~~~~~~~~"
LINE[38]="Public Domain Font Authors"
LINE[39]="c64esque by andraaspar"
LINE[40]="Habbo by Omni"
LINE[41]="Unknown by Anonymous"
LINE[42]=" "
LINE[43]="Nb Pixel Font Bundle"
LINE[44]="Nb Pixel Font Bundle 2"
LINE[45]=" "
LINE[46]=" "
LINE[47]="Copyright 2024 Joshua Sigona <sigonasr2@gmail.com>"
LINE[48]=" "
LINE[49]="Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:"
LINE[50]=" "
LINE[51]="1. Redistributions or derivations of source code must retain the above copyright notice, this list of conditions and the following disclaimer."
LINE[52]=" "
LINE[53]="2. Redistributions or derivative works in binary form must reproduce the above copyright notice. This list of conditions and the following disclaimer must be reproduced in the documentation and/or other materials provided with the distribution."
LINE[54]=" "
LINE[55]="3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission."
LINE[56]=" "
LINE[57]="THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
LINE[47]="Game License"
LINE[48]="~~~~~~~~~~~~~~~~"
LINE[49]="License (OLC-3)"
LINE[50]="~~~~~~~~~~~~~~~"
LINE[51]=" "
LINE[52]="Copyright 2024 Joshua Sigona <sigonasr2@gmail.com>"
LINE[53]=" "
LINE[54]="Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:"
LINE[55]=" "
LINE[56]="1. Redistributions or derivations of source code must retain the above copyright notice, this list of conditions and the following disclaimer."
LINE[57]=" "
LINE[58]="2. Redistributions or derivative works in binary form must reproduce the above copyright notice. This list of conditions and the following disclaimer must be reproduced in the documentation and/or other materials provided with the distribution."
LINE[59]=" "
LINE[60]="3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission."
LINE[61]=" "
LINE[62]="THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
}

@ -1,5 +1,8 @@
map_path = assets/Campaigns/
# The starting node that all players begin on.
starting_map_name = Story I
Levels
{
# Optionally specify

@ -181,7 +181,7 @@ Guess I have to take that answer for now. I am on my way to the Forest then. Bye
===STORY_1_2===
{LOCATION Lestorian Forest}
{BACKGROUND sea.png}
{BACKGROUND commercial_assets/Forest Path.png}
{BGM story}
[?,Greg]
@ -367,7 +367,7 @@ Realizing you might be in extreme danger, you start running, doing your best wit
...
{PAUSE}
{BACKGROUND sea.png}
{BACKGROUND commercial_assets/Forest Path.png}
Finally. Sunlight. You managed to escape the cave uninjured.
{PAUSE}

Loading…
Cancel
Save