Merge branch 'pyfa-org:master' into master
This commit is contained in:
shyadow
@@ -72,7 +72,7 @@ class MutatorBase(EqBase):
|
||||
# dynamic attribute links to the Mutaplasmids attribute definition for this mutated definition
|
||||
self.dynamicAttribute = next(a for a in self.item.mutaplasmid.attributes if a.attributeID == self.attrID)
|
||||
# base attribute links to the base ite's attribute for this mutated definition (contains original, base value)
|
||||
self.baseAttribute = self.item.item.attributes[self.dynamicAttribute.name]
|
||||
self.baseAttribute = self.item.baseItem.attributes[self.dynamicAttribute.name]
|
||||
except (KeyboardInterrupt, SystemExit):
|
||||
raise
|
||||
except:
|
||||
|
||||
@@ -5,4 +5,5 @@ Conversion pack for October 2021 release
|
||||
CONVERSIONS = {
|
||||
# Renamed items
|
||||
"Quafe Zero": "Quafe Zero Classic",
|
||||
"Exigent Sentry Drone Navigation Mutaplasmid": "Exigent Sentry Drone Precision Mutaplasmid",
|
||||
}
|
||||
|
||||
@@ -6881,10 +6881,6 @@
|
||||
"max": 1.149999976158142,
|
||||
"min": 0.699999988079071
|
||||
},
|
||||
"37": {
|
||||
"max": 1.2999999523162842,
|
||||
"min": 1.0
|
||||
},
|
||||
"54": {
|
||||
"max": 1.149999976158142,
|
||||
"min": 0.699999988079071
|
||||
@@ -7451,20 +7447,20 @@
|
||||
"min": 0.699999988079071
|
||||
},
|
||||
"2335": {
|
||||
"max": 1.2000000476837158,
|
||||
"min": 0.800000011920929
|
||||
"max": 1.0119999647140503,
|
||||
"min": 0.9879999756813049
|
||||
},
|
||||
"2336": {
|
||||
"max": 1.2000000476837158,
|
||||
"min": 0.800000011920929
|
||||
"max": 1.0119999647140503,
|
||||
"min": 0.9879999756813049
|
||||
},
|
||||
"2337": {
|
||||
"max": 1.100000023841858,
|
||||
"min": 0.8999999761581421
|
||||
"max": 1.1319999694824219,
|
||||
"min": 0.9909999966621399
|
||||
},
|
||||
"2338": {
|
||||
"max": 1.2000000476837158,
|
||||
"min": 0.800000011920929
|
||||
"max": 1.0119999647140503,
|
||||
"min": 0.9879999756813049
|
||||
}
|
||||
},
|
||||
"inputOutputMapping": [
|
||||
|
||||
@@ -43782,14 +43782,14 @@
|
||||
"2800": {
|
||||
"hasTypes": 1,
|
||||
"iconID": 24905,
|
||||
"name_de": "Drone Mutaplasmids",
|
||||
"name_de": "Drohnen-Mutaplasmide",
|
||||
"name_en-us": "Drone Mutaplasmids",
|
||||
"name_es": "Drone Mutaplasmids",
|
||||
"name_fr": "Drone Mutaplasmids",
|
||||
"name_fr": "Mutaplasmides de drones",
|
||||
"name_it": "Drone Mutaplasmids",
|
||||
"name_ja": "Drone Mutaplasmids",
|
||||
"name_ko": "Drone Mutaplasmids",
|
||||
"name_ru": "Drone Mutaplasmids",
|
||||
"name_ja": "ドローン変異プラスミド",
|
||||
"name_ko": "드론 뮤타플라즈미드",
|
||||
"name_ru": "Мутаплазмиды дронов",
|
||||
"name_zh": "Drone Mutaplasmids",
|
||||
"nameID": 588707,
|
||||
"parentGroupID": 2436
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -65385,10 +65385,10 @@
|
||||
"basePrice": 125000.0,
|
||||
"capacity": 0.0,
|
||||
"description_de": "Fertigkeit zur Verringerung von mit dem Markt verbundenen Kosten. Jede Skillstufe sorgt für einen Abzug von 0,3 % bei den Kosten, die mit der Erstellung eines Marktauftrags in einer NPC-Station verbunden sind, die für gewöhnlich 5 % des Gesamtwerts des Auftrags betragen. Dies kann weiterhin durch das Ansehen des Spielers gegenüber dem Besitzer der Station beeinflusst werden, in welcher der Auftrag erstellt wird.",
|
||||
"description_en-us": "Proficiency at driving down market-related costs. Each level of skill subtracts a flat 0.3% from the costs associated with setting up a market order in a non-player station, which usually come to 5% of the order's total value. This can be further influenced by the player's standing towards the owner of the station where the order is entered.",
|
||||
"description_es": "Proficiency at driving down market-related costs. Each level of skill subtracts a flat 0.3% from the costs associated with setting up a market order in a non-player station, which usually come to 5% of the order's total value. This can be further influenced by the player's standing towards the owner of the station where the order is entered.",
|
||||
"description_en-us": "Proficiency at driving down market-related costs. Each level of skill subtracts a flat 0.3% from the costs associated with setting up a market order in a non-player station, which usually come to 3% of the order's total value. This can be further influenced by the player's standing towards the owner of the station where the order is entered.",
|
||||
"description_es": "Proficiency at driving down market-related costs. Each level of skill subtracts a flat 0.3% from the costs associated with setting up a market order in a non-player station, which usually come to 3% of the order's total value. This can be further influenced by the player's standing towards the owner of the station where the order is entered.",
|
||||
"description_fr": "Compétence permettant de faire baisser les coûts du marché. Chaque niveau de compétence soustrait un pourcentage fixe de 0,3 % aux coûts associés à l'établissement d'un ordre de marché dans une station n'appartenant pas à un joueur, ce qui revient en général à 5 % de la valeur totale de l'ordre. La réputation du joueur auprès du propriétaire de la station où l'ordre a été passé peut également influencer cette relation.",
|
||||
"description_it": "Proficiency at driving down market-related costs. Each level of skill subtracts a flat 0.3% from the costs associated with setting up a market order in a non-player station, which usually come to 5% of the order's total value. This can be further influenced by the player's standing towards the owner of the station where the order is entered.",
|
||||
"description_it": "Proficiency at driving down market-related costs. Each level of skill subtracts a flat 0.3% from the costs associated with setting up a market order in a non-player station, which usually come to 3% of the order's total value. This can be further influenced by the player's standing towards the owner of the station where the order is entered.",
|
||||
"description_ja": "マーケット関連のコスト削減に効果あり。スキルレベル毎にNPCステーションにおけるマーケット注文の関連コストが0.3%減少し、通常は注文のコスト総額が5%低下する。この数値は、オーダーを入れたステーションの所有者に対するプレーヤーのスタンディングにも影響される場合がある。",
|
||||
"description_ko": "거래 시 중개 수수료가 감소합니다. NPC 소유 정거장에서 아이템을 판매할 경우 효과가 적용됩니다. 기본 중개 수수료는 5%로 책정되어 있으며 매 레벨마다 중개 수수료가 0.3% 감소합니다. 정거장을 소유한 NPC의 평판 수치에 따라서 추가적인 중개 수수료 변동이 있습니다.",
|
||||
"description_ru": "Мастерство снижения рыночных издержек. С каждым уровнем этот навык на 0,3% снижает расходы, связанные с размещением заказов в торговой системе на станциях, не принадлежащих игрокам. Обычно они составляют около 5% от общей стоимости заказа. На эти расходы влияют отношения игрока с хозяином станции, на которой оформляется заказ.",
|
||||
@@ -235707,10 +235707,10 @@
|
||||
"basePrice": 5000000.0,
|
||||
"capacity": 0.0,
|
||||
"description_de": "Fertigkeit zur Umgehung der Ecken und Kanten der Buchführung, was das Scheckbuch positiv beeinflusst. Jede Skillstufe reduziert die Transaktionssteuern um 11 %. Die Transaktionssteuern liegen zu Beginn bei 5 %.",
|
||||
"description_en-us": "Proficiency at squaring away the odds and ends of business transactions, keeping the checkbooks tight. Each level of skill reduces sales tax by 11%. Sales tax starts at 5%.",
|
||||
"description_es": "Proficiency at squaring away the odds and ends of business transactions, keeping the checkbooks tight. Each level of skill reduces sales tax by 11%. Sales tax starts at 5%.",
|
||||
"description_en-us": "Proficiency at squaring away the odds and ends of business transactions, keeping the checkbooks tight. Each level of skill reduces sales tax by 11%. Sales tax starts at 8%.",
|
||||
"description_es": "Proficiency at squaring away the odds and ends of business transactions, keeping the checkbooks tight. Each level of skill reduces sales tax by 11%. Sales tax starts at 8%.",
|
||||
"description_fr": "Capacité à boucler proprement les transactions commerciales et à tenir les livres de compte à jour. Chaque niveau de compétence réduit les taxes de vente de 11 %. Les taxes de vente commencent à 5 %.",
|
||||
"description_it": "Proficiency at squaring away the odds and ends of business transactions, keeping the checkbooks tight. Each level of skill reduces sales tax by 11%. Sales tax starts at 5%.",
|
||||
"description_it": "Proficiency at squaring away the odds and ends of business transactions, keeping the checkbooks tight. Each level of skill reduces sales tax by 11%. Sales tax starts at 8%.",
|
||||
"description_ja": "ビジネス取引に関する様々な細かい事柄を処理し、帳簿に漏れがないように管理するスキル。スキルレベルごとに物品税が11%軽減される。物品税は5%から。",
|
||||
"description_ko": "잡다한 거래 기록을 정리하여 돈이 새는 일을 막는 스킬입니다. 매 레벨마다 거래 수수료가 11% 감소합니다. 초기 거래 수수료는 5%입니다.",
|
||||
"description_ru": "Мастерство держать под контролем все — даже самые незначительные — детали деловых операций и не тратить лишнего. С каждым уровнем этого навыка налог на продажу уменьшается на 11%. Налог на продажу начинается с 5%.",
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,10 +1,10 @@
|
||||
[
|
||||
{
|
||||
"field_name": "client_build",
|
||||
"field_value": 1954065
|
||||
"field_value": 1957858
|
||||
},
|
||||
{
|
||||
"field_name": "dump_time",
|
||||
"field_value": 1635082989
|
||||
"field_value": 1635419753
|
||||
}
|
||||
]
|
||||
@@ -1 +1 @@
|
||||
version: v2.38.0
|
||||
version: v2.38.1
|
||||
|
||||
Reference in New Issue
Block a user