From 71f1c69f23fb551d4df893035b210f3f9e0d84b2 Mon Sep 17 00:00:00 2001 From: DarkPhoenix Date: Thu, 25 Jul 2019 10:00:51 +0300 Subject: [PATCH] Plug new fields into actual targetResists objects --- eos/db/saveddata/targetResists.py | 3 +++ eos/saveddata/targetResists.py | 9 +++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/eos/db/saveddata/targetResists.py b/eos/db/saveddata/targetResists.py index f100bc2dd..9e38382bd 100644 --- a/eos/db/saveddata/targetResists.py +++ b/eos/db/saveddata/targetResists.py @@ -31,6 +31,9 @@ targetResists_table = Table("targetResists", saveddata_meta, Column("thermalAmount", Float), Column("kineticAmount", Float), Column("explosiveAmount", Float), + Column("maxVelocity", Float, nullable=True), + Column("signatureRadius", Float, nullable=True), + Column("radius", Float, nullable=True), Column("ownerID", ForeignKey("users.ID"), nullable=True), Column("created", DateTime, nullable=True, default=datetime.datetime.now), Column("modified", DateTime, nullable=True, onupdate=datetime.datetime.now) diff --git a/eos/saveddata/targetResists.py b/eos/saveddata/targetResists.py index 7d1f2956e..8b364e06e 100644 --- a/eos/saveddata/targetResists.py +++ b/eos/saveddata/targetResists.py @@ -31,11 +31,14 @@ class TargetResists: def __init__(self, *args, **kwargs): self.update(*args, **kwargs) - def update(self, emAmount=0, thermalAmount=0, kineticAmount=0, explosiveAmount=0): + def update(self, emAmount=0, thermalAmount=0, kineticAmount=0, explosiveAmount=0, maxVelocity=None, signatureRadius=None, radius=None): self.emAmount = emAmount self.thermalAmount = thermalAmount self.kineticAmount = kineticAmount self.explosiveAmount = explosiveAmount + self.maxVelocity = maxVelocity + self.signatureRadius = signatureRadius + self.radius = radius @classmethod def importPatterns(cls, text): @@ -111,6 +114,8 @@ class TargetResists: return out.strip() def __deepcopy__(self, memo): - p = TargetResists(self.emAmount, self.thermalAmount, self.kineticAmount, self.explosiveAmount) + p = TargetResists( + self.emAmount, self.thermalAmount, self.kineticAmount, self.explosiveAmount, + self.maxVelocity, self.signatureRadius, self.radius) p.name = "%s copy" % self.name return p