diff --git a/Adventures in Lestoria/IBullet.cpp b/Adventures in Lestoria/IBullet.cpp index 317a3736..af657393 100644 --- a/Adventures in Lestoria/IBullet.cpp +++ b/Adventures in Lestoria/IBullet.cpp @@ -118,7 +118,7 @@ void IBullet::_Update(const float fElapsedTime){ } } } - } else { + }else{ if(geom2d::overlaps(game->GetPlayer()->Hitbox(),geom2d::circle(pos,radius))){ if(hitList.find(game->GetPlayer())==hitList.end()){ HurtDamageInfo damageData{game->GetPlayer(),damage,OnUpperLevel(),z,HurtFlag::NONE}; diff --git a/Adventures in Lestoria/Version.h b/Adventures in Lestoria/Version.h index 78e6ecf1..e8c09e46 100644 --- a/Adventures in Lestoria/Version.h +++ b/Adventures in Lestoria/Version.h @@ -39,7 +39,7 @@ All rights reserved. #define VERSION_MAJOR 1 #define VERSION_MINOR 3 #define VERSION_PATCH 0 -#define VERSION_BUILD 11891 +#define VERSION_BUILD 11893 #define stringify(a) stringify_(a) #define stringify_(a) #a diff --git a/Adventures in Lestoria/assets/config/story/Chapter 1.txt b/Adventures in Lestoria/assets/config/story/Chapter 1.txt index 98190be8..e86aaa12 100644 --- a/Adventures in Lestoria/assets/config/story/Chapter 1.txt +++ b/Adventures in Lestoria/assets/config/story/Chapter 1.txt @@ -193,6 +193,7 @@ The voice is coming from the tops of the trees. A man peeks down from a tree can You confirm there are no more monsters in sight. +{RIGHT You} [You] I can't see any more at least. diff --git a/Adventures in Lestoria/assets/gamepack.pak b/Adventures in Lestoria/assets/gamepack.pak index 688f9bce..2d85be94 100644 Binary files a/Adventures in Lestoria/assets/gamepack.pak and b/Adventures in Lestoria/assets/gamepack.pak differ diff --git a/Adventures in Lestoria/assets/items/Bandana.png b/Adventures in Lestoria/assets/items/Bandana.png index 9f1e19ec..2b395688 100644 Binary files a/Adventures in Lestoria/assets/items/Bandana.png and b/Adventures in Lestoria/assets/items/Bandana.png differ diff --git a/Adventures in Lestoria/assets/items/Blue Gemstone.png b/Adventures in Lestoria/assets/items/Blue Gemstone.png index 9f1e19ec..bee1a737 100644 Binary files a/Adventures in Lestoria/assets/items/Blue Gemstone.png and b/Adventures in Lestoria/assets/items/Blue Gemstone.png differ diff --git a/Adventures in Lestoria/assets/items/Bomb.png b/Adventures in Lestoria/assets/items/Bomb.png index 9f1e19ec..97c67b1c 100644 Binary files a/Adventures in Lestoria/assets/items/Bomb.png and b/Adventures in Lestoria/assets/items/Bomb.png differ diff --git a/Adventures in Lestoria/assets/items/Captain's Diamond Ring.png b/Adventures in Lestoria/assets/items/Captain's Diamond Ring.png index cbe5a165..e4458d92 100644 Binary files a/Adventures in Lestoria/assets/items/Captain's Diamond Ring.png and b/Adventures in Lestoria/assets/items/Captain's Diamond Ring.png differ diff --git a/Adventures in Lestoria/assets/items/Crab Claw.png b/Adventures in Lestoria/assets/items/Crab Claw.png index aadcffd5..20b32a06 100644 Binary files a/Adventures in Lestoria/assets/items/Crab Claw.png and b/Adventures in Lestoria/assets/items/Crab Claw.png differ diff --git a/Adventures in Lestoria/assets/items/Empty Leather Pouch.png b/Adventures in Lestoria/assets/items/Empty Leather Pouch.png index 9f1e19ec..14f1c3ea 100644 Binary files a/Adventures in Lestoria/assets/items/Empty Leather Pouch.png and b/Adventures in Lestoria/assets/items/Empty Leather Pouch.png differ diff --git a/Adventures in Lestoria/assets/items/Giant Claw.png b/Adventures in Lestoria/assets/items/Giant Claw.png index 9f1e19ec..a963e80b 100644 Binary files a/Adventures in Lestoria/assets/items/Giant Claw.png and b/Adventures in Lestoria/assets/items/Giant Claw.png differ diff --git a/Adventures in Lestoria/assets/items/Instant Refresh Potion.png b/Adventures in Lestoria/assets/items/Instant Refresh Potion.png index 9f1e19ec..89e3eaf5 100644 Binary files a/Adventures in Lestoria/assets/items/Instant Refresh Potion.png and b/Adventures in Lestoria/assets/items/Instant Refresh Potion.png differ diff --git a/Adventures in Lestoria/assets/items/Large Shell.png b/Adventures in Lestoria/assets/items/Large Shell.png index 9f1e19ec..4134b853 100644 Binary files a/Adventures in Lestoria/assets/items/Large Shell.png and b/Adventures in Lestoria/assets/items/Large Shell.png differ diff --git a/Adventures in Lestoria/assets/items/Octopus Ring.png b/Adventures in Lestoria/assets/items/Octopus Ring.png index aadcffd5..be0da355 100644 Binary files a/Adventures in Lestoria/assets/items/Octopus Ring.png and b/Adventures in Lestoria/assets/items/Octopus Ring.png differ diff --git a/Adventures in Lestoria/assets/items/Rum Bottle.png b/Adventures in Lestoria/assets/items/Rum Bottle.png index 9f1e19ec..6c23cd96 100644 Binary files a/Adventures in Lestoria/assets/items/Rum Bottle.png and b/Adventures in Lestoria/assets/items/Rum Bottle.png differ diff --git a/Adventures in Lestoria/assets/items/Shell.png b/Adventures in Lestoria/assets/items/Shell.png index 9f1e19ec..6bfb4781 100644 Binary files a/Adventures in Lestoria/assets/items/Shell.png and b/Adventures in Lestoria/assets/items/Shell.png differ diff --git a/Adventures in Lestoria/assets/items/Stone Potion.png b/Adventures in Lestoria/assets/items/Stone Potion.png index 9f1e19ec..d005c528 100644 Binary files a/Adventures in Lestoria/assets/items/Stone Potion.png and b/Adventures in Lestoria/assets/items/Stone Potion.png differ diff --git a/Adventures in Lestoria/assets/items/White Feather.png b/Adventures in Lestoria/assets/items/White Feather.png index 9f1e19ec..ea350c19 100644 Binary files a/Adventures in Lestoria/assets/items/White Feather.png and b/Adventures in Lestoria/assets/items/White Feather.png differ diff --git a/Adventures in Lestoria/assets/items/Worm Skin.png b/Adventures in Lestoria/assets/items/Worm Skin.png index 9f1e19ec..81d8027b 100644 Binary files a/Adventures in Lestoria/assets/items/Worm Skin.png and b/Adventures in Lestoria/assets/items/Worm Skin.png differ diff --git a/x64/Release/Adventures in Lestoria.exe b/x64/Release/Adventures in Lestoria.exe index b5730341..ce9a0271 100644 Binary files a/x64/Release/Adventures in Lestoria.exe and b/x64/Release/Adventures in Lestoria.exe differ