diff --git a/Crawler/Player.h b/Crawler/Player.h index 4a12e000..a95e9c63 100644 --- a/Crawler/Player.h +++ b/Crawler/Player.h @@ -416,7 +416,7 @@ struct Witch:Player{ class::rightClickAbility={ \ #class".Right Click Ability.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.Mana Cost"_I, \ &KEY_DEFENSIVE, \ @@ -429,7 +429,7 @@ struct Witch:Player{ class::ability1={ \ #class".Ability 1.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.Mana Cost"_I, \ &KEY_ABILITY1, \ @@ -442,7 +442,7 @@ struct Witch:Player{ class::ability2={ \ #class".Ability 2.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.Mana Cost"_I, \ &KEY_ABILITY2, \ @@ -455,7 +455,7 @@ struct Witch:Player{ class::ability3={ \ #class".Ability 3.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.Mana Cost"_I, \ &KEY_ABILITY3, \ diff --git a/Crawler/Version.h b/Crawler/Version.h index b62a396d..84073f83 100644 --- a/Crawler/Version.h +++ b/Crawler/Version.h @@ -39,7 +39,7 @@ All rights reserved. #define VERSION_MAJOR 0 #define VERSION_MINOR 2 #define VERSION_PATCH 1 -#define VERSION_BUILD 3332 +#define VERSION_BUILD 3335 #define stringify(a) stringify_(a) #define stringify_(a) #a diff --git a/Crawler/assets/config/classes/Wizard.txt b/Crawler/assets/config/classes/Wizard.txt index 2e7a595c..084ecb73 100644 --- a/Crawler/assets/config/classes/Wizard.txt +++ b/Crawler/assets/config/classes/Wizard.txt @@ -154,7 +154,7 @@ Wizard # Whether or not this ability cancels casts. 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. Cooldown Bar Color 1 = 64, 0, 0, 192 diff --git a/Crawler/assets/wizard_full_render.png b/Crawler/assets/wizard_full_render.png index 404858a2..b90038c5 100644 Binary files a/Crawler/assets/wizard_full_render.png and b/Crawler/assets/wizard_full_render.png differ diff --git a/Crawler/assets/wizard_full_render.xcf b/Crawler/assets/wizard_full_render.xcf index afcfb50a..c02924e3 100644 Binary files a/Crawler/assets/wizard_full_render.xcf and b/Crawler/assets/wizard_full_render.xcf differ diff --git a/Crawler/olcUTIL_DataFile.h b/Crawler/olcUTIL_DataFile.h index bd314505..d97b68a3 100644 --- a/Crawler/olcUTIL_DataFile.h +++ b/Crawler/olcUTIL_DataFile.h @@ -482,6 +482,14 @@ namespace olc::utils inline datafilestringdata(datafile&dat,std::string key) :data(dat),key(key){}; 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 {