diff --git a/js/c++/powders.cpp b/js/c++/powders.cpp index a6e42c7..e999f5d 100644 --- a/js/c++/powders.cpp +++ b/js/c++/powders.cpp @@ -33,13 +33,13 @@ Powder::Powder(int min, int max, int conv, int defPlus, int defMinus) : min(min), max(max), convert(conv), defPlus(defPlus), defMinus(defMinus) {} const std::vector powderStats = []{ - auto _p = [](int a, int b, int c, int d, int e){ return Powder(a,b,c,d,e); }; + auto p = [](int a, int b, int c, int d, int e){ return Powder(a,b,c,d,e); }; return std::vector { - _p(3,6,17,2,1), _p(5,8,21,4,2), _p(6,10,25,8,3), _p(7,10,31,14,5), _p(9,11,38,22,9), _p(11,13,46,30,13), - _p(1,8,9,3,1), _p(1,12,11,5,1), _p(2,15,13,9,2), _p(3,15,17,14,4), _p(4,17,22,20,7), _p(5,20,28,28,10), - _p(3,4,13,3,1), _p(4,6,15,6,1), _p(5,8,17,11,2), _p(6,8,21,18,4), _p(7,10,26,28,7), _p(9,11,32,40,10), - _p(2,5,14,3,1), _p(4,8,16,5,2), _p(5,9,19,9,3), _p(6,9,24,16,5), _p(8,10,30,25,9), _p(10,12,37,36,13), - _p(2,6,11,3,1), _p(3,10,14,6,2), _p(4,11,17,10,3), _p(5,11,22,16,5), _p(7,12,28,24,9), _p(8,14,35,34,13) + p(3,6,17,2,1), p(5,8,21,4,2), p(6,10,25,8,3), p(7,10,31,14,5), p(9,11,38,22,9), p(11,13,46,30,13), + p(1,8,9,3,1), p(1,12,11,5,1), p(2,15,13,9,2), p(3,15,17,14,4), p(4,17,22,20,7), p(5,20,28,28,10), + p(3,4,13,3,1), p(4,6,15,6,1), p(5,8,17,11,2), p(6,8,21,18,4), p(7,10,26,28,7), p(9,11,32,40,10), + p(2,5,14,3,1), p(4,8,16,5,2), p(5,9,19,9,3), p(6,9,24,16,5), p(8,10,30,25,9), p(10,12,37,36,13), + p(2,6,11,3,1), p(3,10,14,6,2), p(4,11,17,10,3), p(5,11,22,16,5), p(7,12,28,24,9), p(8,14,35,34,13) }; }(); diff --git a/js/c++/powders.js.in b/js/c++/powders.js.in index 9facaff..4571e85 100644 --- a/js/c++/powders.js.in +++ b/js/c++/powders.js.in @@ -34,17 +34,6 @@ let powderStats = [ _p(2,6,11,3,1), _p(3,10,14,6,2), _p(4,11,17,10,3), _p(5,11,22,16,5), _p(7,12,28,24,9), _p(8,14,35,34,13) ]; -class PowderIngredient { - constructor(durability, skpReq) { - this.durability = durability; - this.skpReq = skpReq; - } -} -function _pi(a,b) { return new PowderIngredient(a,b)} - -let powderIngreds = [ - _pi(-35,0),_pi(-52.5,0),_pi(-70,10),_pi(-91,20),_pi(-112,28),_pi(-133,36) -]; //Ordering: [weapon special name, weapon special effects, armor special name, armor special effects] class PowderSpecial{ constructor(wSpName, wSpEff, aSpName, aSpEff, cap){