diff --git a/WeatherMethods.h b/WeatherMethods.h index 0044c29..8bfe301 100644 --- a/WeatherMethods.h +++ b/WeatherMethods.h @@ -62,10 +62,11 @@ namespace LuaWeather /** * Regenerates the &Weather, causing it to change based on the below statistics. - * - 30% chance of no change - * - 30% chance of &Weather getting better (if not fine) or changing &Weather type - * - 30% chance of &Weather getting worse (if not fine) - * - 10% chance of radical change (if not fine) + * + * * 30% chance of no change + * * 30% chance of &Weather getting better (if not fine) or changing &Weather type + * * 30% chance of &Weather getting worse (if not fine) + * * 10% chance of radical change (if not fine) * * @return bool changed : returns 'true' if &Weather changed */ diff --git a/docs/ElunaDoc/__main__.py b/docs/ElunaDoc/__main__.py index 159649b..d73d092 100644 --- a/docs/ElunaDoc/__main__.py +++ b/docs/ElunaDoc/__main__.py @@ -159,4 +159,4 @@ if __name__ == '__main__': # Render each method's page. for method in class_.methods: method_path = '{}/{}.html'.format(class_.name, method.name) - render('method.html', method_path, level=1, current_class=class_, current_method=method) \ No newline at end of file + render('method.html', method_path, level=1, current_class=class_, current_method=method) diff --git a/docs/ElunaDoc/parser.py b/docs/ElunaDoc/parser.py index 6d82ec0..ca5662d 100644 --- a/docs/ElunaDoc/parser.py +++ b/docs/ElunaDoc/parser.py @@ -43,6 +43,10 @@ class ParameterDoc(object): self.description += '
Valid numbers: all decimal numbers.
' self.data_type = 'number' + elif self.data_type == 'bool': + self.data_type = 'boolean' + elif self.data_type == 'uint64': + self.data_type = 'string' class MethodDoc(object): @@ -106,7 +110,7 @@ class ClassParser(object): param_regex = re.compile(r"""\s*\*\s@param\s # The @param tag starts with opt. whitespace followed by "* @param ". ([&\w]+)\s(\w+) # The data type, a space, and the name of the param. - (?:\s=\s(.+))? # The default value: a = surrounded by spaces, followed by text. + (?:\s=\s(.-))? # The default value: a = surrounded by spaces, followed by text. (?:\s:\s(.+))? # The description: a colon surrounded by spaces, followed by text.""", re.X) @@ -239,4 +243,4 @@ class ClassParser(object): parser.next_line(line) line = file.readline() - return parser.to_class_doc() \ No newline at end of file + return parser.to_class_doc()