User:Trang Oul/Utils - Revision history

Trang Oul: yard help

2025-07-10T14:14:52Z

yard help

Trang Oul: added yard formatting

2025-07-10T14:07:56Z

added yard formatting

Trang Oul: /* Converting Diablo data files into a spreadsheet */

2025-02-10T16:30:45Z

Converting Diablo data files into a spreadsheet

Trang Oul: formatting

2025-02-10T10:57:06Z

formatting

Trang Oul: saving D2 files into a spreadsheet

2025-02-10T10:55:03Z

saving D2 files into a spreadsheet

Trang Oul: /* 2. Calculation */

2024-08-12T09:25:37Z

2. Calculation

Trang Oul: /* 2. Calculation */ formatting util

2024-07-26T07:45:56Z

2. Calculation: formatting util

Show changes

Trang Oul: /* 2. Calculation */ mixed number formatting (for range in yards)

2024-07-19T12:05:27Z

2. Calculation: mixed number formatting (for range in yards)

Trang Oul: removed pure Python methods (Sympy is better anyway); added hitshift param

2024-07-19T07:23:42Z

removed pure Python methods (Sympy is better anyway); added hitshift param

Show changes

Trang Oul: /* Multipliers */ SrcDamage

2024-07-18T07:35:45Z

Multipliers: SrcDamage

@@ Line 467: / Line 467: @@
 Simplified formulae are also printed.
 For time values formulae with integer and decimal coefficients are printed.
 If the values need to be aligned in the tables, use the parameters rational, places_int, places_frac and pad_sign.

@@ Line 212: / Line 212: @@
 FRAMES_PER_SECOND:int = 25
@@ Line 320: / Line 321: @@
 class Stat:
-	def __init__(self, desc:str, formula, params:dict|None=None, hitshift:int=8, rational:bool=False, places_int:int=1, places_frac:int=0, pad_sign:bool=False, seconds:bool=False) -> None:
+	def __init__(self, desc:str, formula, params:dict|None=None, hitshift:int=8, srcdam:int=128, rational:bool=False, places_int:int=1, places_frac:int=0, pad_sign:bool=False, seconds:bool=False, yards:bool=False) -> None:
 		if params is None:
 			params = {}
 		self.desc = desc
 		self.params = params
-		self.rational = rational
+		self.rational = rational or yards
 		self.places_int  = min(places_int, 1)
 		self.places_frac = places_frac
 		self.pad_sign = pad_sign
-		self.formula = self.make_formula(formula, hitshift, seconds)
+		self.formula = self.make_formula(formula=formula, hitshift=hitshift, srcdam=srcdam, seconds=seconds, yards=yards)
 		if isinstance(self.formula, sympy.core.expr.Expr):
 			print(self.desc)
@@ Line 335: / Line 336: @@
 	@classmethod
-	def make_formula(cls, formula, hitshift:int=8, seconds:bool=False):
+	def make_formula(cls, formula, hitshift:int=8, srcdam:int=128, seconds:bool=False, yards:bool=False):
 		if isinstance(formula, (str, int, float, Fraction)):
 			formula = make_formula(formula)
-		factor = sympy.Pow(2, hitshift-8)
+		hitshift_factor = sympy.Pow(2, hitshift-8)
-		formula = formula * factor
+		srcdam_factor = sympy.Rational(srcdam, 128)
 		if seconds:
 			if isinstance(formula, sympy.core.expr.Expr):
 				formula = formula / FRAMES_PER_SECOND
 		return formula
@@ Line 414: / Line 421: @@
 		pad_sign = '-' if val.is_negative else '{{0|-}}' if pad_sign else ''
 		absval = abs(val)
 		absval_int  = sympy.Integer(absval)
 		absval_frac = absval - absval_int
 		int_part = pad_int(val=absval_int, places=places_int, hide_zero=rational and val.is_nonzero)
 		pad_frac = pad_frac_rational if rational else pad_frac_irrational
 		frac_part = pad_frac(val=absval_frac, places=places_frac)
 		# return f'{pad_sign} ## {int_part} ## {frac_part}'
 		return f'{pad_sign}{int_part}{frac_part}'
@@ Line 437: / Line 441: @@
 		if seconds:
 			print(expr.evalf())
 def build_table(stats, maxlvl:int=60, splitlvl:int=10):

@@ Line 528: / Line 528: @@
 ==Requirements==
 * '''Windows'''
 * '''Python 3''' with the following packages installed:
@@ Line 533: / Line 534: @@
 ** '''xlsxwriter''' or '''openpyxl'''
-==Optional==
+===Optional===
 * '''Microsoft Excel'''
 * '''pywin32''' Python package

@@ Line 526: / Line 526: @@
 Here is a script that merges all the data files into a single spreadsheet.
-Requirements:
 * '''Windows'''
 * '''Python 3''' with the following packages installed:
 ** '''pandas'''
 ** '''xlsxwriter''' or '''openpyxl'''
-Optional:
 * '''Microsoft Excel'''
 * '''pywin32''' Python package
-Features:
+==Features==
 * works both with D2 and D2R files, making it easier to compare them (actually the script was created for this purpose)
 * applies basic formatting:
@@ Line 545: / Line 547: @@
 * currently hardcoded input and output paths
-Script:
+==Script==
 <pre>
 #coding: utf-8
@@ Line 627: / Line 629: @@
 </pre>
-Usage:
+==Usage==
 * save the script to a directory
 * have D2 or D2R data (not necessarily both) in subdirectories defined in <code>VERSION_TO_DATA_DIRECTORY</code>
 * run the script
 * output is saved to the path defined in <code>EXCEL_SPREADSHEET_NAME</code>

@@ Line 465: / Line 465: @@
 For time values formulae with integer and decimal coefficients are printed.
-If th
+If the values need to be aligned in the tables, use the parameters rational, places_int, places_frac and pad_sign.
+"""
 stats: tuple[Stat] = (
 	Stat(desc='Inner Sight Duration (Seconds)',  formula=ln34,                                                             params={par3: 300, par4: 150}, seconds=True),
@@ Line 519: / Line 520: @@
 #print(build_table(stats))
 </pre>

@@ Line 299: / Line 299: @@
 class Stat:
-	def __init__(self, desc:str, formula, params:dict|None=None, hitshift:int=8, seconds:bool=False) -> None:
+	def __init__(self, desc:str, formula, params:dict|None=None, hitshift:int=8, mixed:bool=False, seconds:bool=False) -> None:
 		if params is None:
 			params = {}
 		self.desc = desc
 		self.params = params
 		self.formula = self.make_formula(formula, hitshift, seconds)
 		if isinstance(self.formula, sympy.core.expr.Expr):
@@ Line 329: / Line 330: @@
 		return ival if ival == fval else fval
-	def eval(self, slvl:int) -> int|float:
+	@classmethod
-		return self.round((self.formula.subs({lvl: slvl} | self.params)))
+	def as_mixed(cls, val:sympy.Rational) -> str:
 	def print_expr(self, seconds:bool=False) -> None:

@@ Line 34: / Line 34: @@
 ====Multipliers====
 * <code><nowiki>hitshift</nowiki></code> - used to multiply the damage by a power of 2 (<code>2^(hitshift-8)</code>; 8 = ×1). See Phrozen Keep guide for details.
 ===Formula details===