sigonasr2/AdventuresInLestoria
1
1
Fork 0
Code Issues 11 Pull Requests Projects 1 Releases Wiki Activity

Correct the parsing of comma-separated descriptions for class previews. Move Wizard Render slightly to the right.

Browse Source
This commit is contained in:
sigonasr2 2023-11-30 20:18:05 -06:00
parent d5055b2f2b
commit 47d7c02bb6
6 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Crawler/Player.h
View File

@ -416,7 +416,7 @@ struct Witch:Player{
class::rightClickAbility={ \ class::rightClickAbility={ \
#class".Right Click Ability.Name"_S, \ #class".Right Click Ability.Name"_S, \
#class".Right Click Ability.Short Name"_S, \ #class".Right Click Ability.Short Name"_S, \
#class".Right Click Ability.Description"_S, \ #class".Right Click Ability.Description"_s.concat(), \
#class".Right Click Ability.Cooldown"_F, \ #class".Right Click Ability.Cooldown"_F, \
#class".Right Click Ability.Mana Cost"_I, \ #class".Right Click Ability.Mana Cost"_I, \
&KEY_DEFENSIVE, \ &KEY_DEFENSIVE, \
@ -429,7 +429,7 @@ struct Witch:Player{
class::ability1={ \ class::ability1={ \
#class".Ability 1.Name"_S, \ #class".Ability 1.Name"_S, \
#class".Ability 1.Short Name"_S, \ #class".Ability 1.Short Name"_S, \
#class".Ability 1.Description"_S, \ #class".Ability 1.Description"_s.concat(), \
#class".Ability 1.Cooldown"_F, \ #class".Ability 1.Cooldown"_F, \
#class".Ability 1.Mana Cost"_I, \ #class".Ability 1.Mana Cost"_I, \
&KEY_ABILITY1, \ &KEY_ABILITY1, \
@ -442,7 +442,7 @@ struct Witch:Player{
class::ability2={ \ class::ability2={ \
#class".Ability 2.Name"_S, \ #class".Ability 2.Name"_S, \
#class".Ability 2.Short Name"_S, \ #class".Ability 2.Short Name"_S, \
#class".Ability 2.Description"_S, \ #class".Ability 2.Description"_s.concat(), \
#class".Ability 2.Cooldown"_F, \ #class".Ability 2.Cooldown"_F, \
#class".Ability 2.Mana Cost"_I, \ #class".Ability 2.Mana Cost"_I, \
&KEY_ABILITY2, \ &KEY_ABILITY2, \
@ -455,7 +455,7 @@ struct Witch:Player{
class::ability3={ \ class::ability3={ \
#class".Ability 3.Name"_S, \ #class".Ability 3.Name"_S, \
#class".Ability 3.Short Name"_S, \ #class".Ability 3.Short Name"_S, \
#class".Ability 3.Description"_S, \ #class".Ability 3.Description"_s.concat(), \
#class".Ability 3.Cooldown"_F, \ #class".Ability 3.Cooldown"_F, \
#class".Ability 3.Mana Cost"_I, \ #class".Ability 3.Mana Cost"_I, \
&KEY_ABILITY3, \ &KEY_ABILITY3, \

2
Crawler/Version.h
View File

@ -39,7 +39,7 @@ All rights reserved.
#define VERSION_MAJOR 0 #define VERSION_MAJOR 0
#define VERSION_MINOR 2 #define VERSION_MINOR 2
#define VERSION_PATCH 1 #define VERSION_PATCH 1
#define VERSION_BUILD 3332 #define VERSION_BUILD 3335
#define stringify(a) stringify_(a) #define stringify(a) stringify_(a)
#define stringify_(a) #a #define stringify_(a) #a

2
Crawler/assets/config/classes/Wizard.txt
View File

@ -154,7 +154,7 @@ Wizard
# Whether or not this ability cancels casts. # Whether or not this ability cancels casts.
CancelCast = 0 CancelCast = 0
Description = Shoot an electrically charged bolt at enemies, spreads to two other targets upon impact. Description = Shoot an electrically charged bolt, spreads to two other targets upon impact.
#RGB Values. Color 1 is the circle at full cooldown, Color 2 is the color at empty cooldown. #RGB Values. Color 1 is the circle at full cooldown, Color 2 is the color at empty cooldown.
Cooldown Bar Color 1 = 64, 0, 0, 192 Cooldown Bar Color 1 = 64, 0, 0, 192

BIN
Crawler/assets/wizard_full_render.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.4 KiB

After

Width:  |  Height:  |  Size: 4.6 KiB

BIN
Crawler/assets/wizard_full_render.xcf
View File

Binary file not shown.

8
Crawler/olcUTIL_DataFile.h
View File

@ -482,6 +482,14 @@ namespace olc::utils
inline datafilestringdata(datafile&dat,std::string key) inline datafilestringdata(datafile&dat,std::string key)
:data(dat),key(key){}; :data(dat),key(key){};
std::string operator[](int index){return data.get().GetProperty(key).GetString(index);}; std::string operator[](int index){return data.get().GetProperty(key).GetString(index);};
inline std::string concat(){
std::string finalStr="";
for(std::string&str:data.get().GetProperty(key).GetValues()){
if(finalStr.length()>0)finalStr+=", ";
finalStr+=str;
}
return finalStr;
}
}; };
class datafileintdata class datafileintdata
{ {