diff --git a/frackinship/configs/shipupgrades.config b/frackinship/configs/shipupgrades.config index 9e47c94cb45..1052b89db35 100644 --- a/frackinship/configs/shipupgrades.config +++ b/frackinship/configs/shipupgrades.config @@ -19,11 +19,6 @@ "max" : 384, "totalMin" : 5 }, - "shipMass" : { - "min" : -200, - "max" : 200, - "totalMin" : 0 - }, "atmosphereSystem" : { "maxPerimeter" : 1000, "requireFilledBackground" : true diff --git a/frackinship/scripts/quest/shipupgrades.lua b/frackinship/scripts/quest/shipupgrades.lua index 696940aeb48..71b537e0315 100644 --- a/frackinship/scripts/quest/shipupgrades.lua +++ b/frackinship/scripts/quest/shipupgrades.lua @@ -97,9 +97,9 @@ function update(dt) end --crewStats is set in /scripts/companions/player.lua - local crewStats=status.statusProperty("fu_shipUpgradeStatProperty") or {shipmass=10,fuelEfficiency=0,shipSpeed=15,maxFuel=10000} + local crewStats=status.statusProperty("fu_shipUpgradeStatProperty") or {fuelEfficiency=0,shipSpeed=15,maxFuel=10000} --sb.logInfo("crewStats=%s",crewStats) - --[09:00:44.604] [Info] crewStats={shipMass: 10, fuelEfficiency: 0, shipSpeed: 15, maxFuel: 10000} + --[09:00:44.604] [Info] crewStats={fuelEfficiency: 0, shipSpeed: 15, maxFuel: 10000} local crewSizeBYOS = world.getProperty("fu_byos.crewSize") or 0 local shipMaxFuel = world.getProperty("ship.maxFuel") @@ -111,7 +111,6 @@ function update(dt) local shipShipSpeed = shipUpgrades.shipSpeed local shipSpeedStat = status.stat("shipSpeed") local shipSpeedBYOS = world.getProperty("fu_byos.shipSpeed") or 0 - local shipMassBYOS = world.getProperty("fu_byos.shipMass") or 0 if crewSizeBYOS then crewSizeNew, crewSizeBYOSNew = calculateNew("crewSize", crewSizeBYOS, crewSizeBYOSOld, shipCrewSize) @@ -176,22 +175,6 @@ function update(dt) shipSpeedBYOSOld = shipSpeedBYOSNew end]] end - if shipMassBYOS then - --local newShipMass=clampStat("shipMass",((crewStats and crewStats.shipMass) or 0)+shipMassBYOS-status.stat("shipMass")) - --crew modifier for ship mass is basically unused, go figure. - status.clearPersistentEffects("byos") - local shipMassStat = status.stat("shipMass") - --shipMassStat = status.stat("shipMass") - --sb.logInfo("ship mass stat %s, shipMassBYOS %s",shipMassStat,shipMassBYOS) - shipMassTotal, shipMassModifier = calculateNew("shipMass", shipMassBYOS, 0, shipMassStat) - --sb.logInfo("ship mass total, ship mass modifier, pre calc %s %s",shipMassTotal, shipMassModifier) - if shipMassStat + shipMassModifier ~= shipMassTotal then - shipMassModifier = shipMassTotal - shipMassStat - end - --sb.logInfo("ship mass total, ship mass modifier, post calc %s %s",shipMassTotal, shipMassModifier) - status.addPersistentEffect("byos", {stat = "shipMass", amount = shipMassModifier}) - --status.addPersistentEffect("byos", {stat = "shipMass", amount = newShipMass}) - end --[[if maxFuelNew and world.getProperty("ship.fuel") > maxFuelNew then world.setProperty("ship.fuel", maxFuelNew) end]] diff --git a/interface/cockpit/cockpit.lua b/interface/cockpit/cockpit.lua index 3e503a4425e..1d661afecd9 100644 --- a/interface/cockpit/cockpit.lua +++ b/interface/cockpit/cockpit.lua @@ -413,10 +413,6 @@ end -- For FU -function shipMassFind() - self.shipMass = status.stat("shipMass") /10 -end - function fuelBonusFind() self.fuelBonus = status.stat("maxFuel") end @@ -445,17 +441,16 @@ function fuelCost(travel) self.one = celestial.currentSystem() self.two = {location = travel or self.travel.system, planet = 0, satellite = 0, system = self.travel.target} local distanceMath = math.sqrt( ( (self.one.location[1] - self.two.location[1]) ^ 2 ) + ( (self.one.location[2] - self.two.location[2]) ^ 2 ) ) - shipMassFind() - local shipMass=self.shipMass or 0 + local cost if distanceMath < 30 then - cost = 50 + ((config.getParameter("jumpFuelCost") + distanceMath) * (shipMass + 2)) -- nearby systems are relatively cheap to travel to + cost = 50 + ((config.getParameter("jumpFuelCost") + distanceMath) * 2.3) -- nearby systems are relatively cheap to travel to elseif distanceMath < 200 then - cost = 70 + ((config.getParameter("jumpFuelCost") + distanceMath) * (shipMass + 4)) -- a bit farther out + cost = 70 + ((config.getParameter("jumpFuelCost") + distanceMath) * 4.3) -- a bit farther out elseif distanceMath < 400 then - cost = 140 + ((config.getParameter("jumpFuelCost") + distanceMath) * (shipMass + 6)) -- mid/long range + cost = 140 + ((config.getParameter("jumpFuelCost") + distanceMath) * 6.3) -- mid/long range else - cost = 300 + ((config.getParameter("jumpFuelCost") + distanceMath) * (shipMass + 10)) -- long range value + cost = 300 + ((config.getParameter("jumpFuelCost") + distanceMath) * 10.3) -- long range value end if cost < 1000 and isConnected(self.one,self.two) then diff --git a/interface/scripted/statWindow/extraStatsWindow.config b/interface/scripted/statWindow/extraStatsWindow.config index d4610cc4ca1..9fcf8e68a96 100644 --- a/interface/scripted/statWindow/extraStatsWindow.config +++ b/interface/scripted/statWindow/extraStatsWindow.config @@ -172,13 +172,6 @@ "value" : "---" }, - "shipMass" : { - "type" : "label", - "position" : [112, 33], - "hAnchor" : "mid", - "value" : "---" - }, - ////////////////////////////////////////// 7th row "healingBonus" : { @@ -231,7 +224,6 @@ // "shieldHealth" : "flat", // "shieldRegen" : "flat", // "shieldStaminaRegen" : "flat", - "shipMass" : "flat", "healingBonus" : "percent", "fuCharisma" : "charisma", "mentalProtection" : "percent" @@ -269,7 +261,6 @@ {"x1": 87, "y1": 74, "x2": 127, "y2": 86, "tooltip": "Crit Chance"}, {"x1": 87, "y1": 60, "x2": 127, "y2": 72, "tooltip": "Starvation (Minutes from Full)"}, {"x1": 87, "y1": 46, "x2": 127, "y2": 58, "tooltip": "Fall Damage Mult"}, - {"x1": 87, "y1": 32, "x2": 127, "y2": 44, "tooltip": "Ship Mass"}, {"x1": 87, "y1": 18, "x2": 127, "y2": 30, "tooltip": "Madness Resistance"} ], diff --git a/items/active/crewcontracts/crewcontract_cyborg.activeitem b/items/active/crewcontracts/crewcontract_cyborg.activeitem index 3ee5ee3996f..b9f57388126 100644 --- a/items/active/crewcontracts/crewcontract_cyborg.activeitem +++ b/items/active/crewcontracts/crewcontract_cyborg.activeitem @@ -6,7 +6,7 @@ "maxStack" : 1, "rarity" : "Legendary", "category" : "crewcontract", - "description" : "Hires a deadly cyborg. ^cyan;Reduces ship mass by 10%^reset;, increases ship speed by 1.25 and grants ^pink;Aether Immunity^reset;.", + "description" : "Hires a deadly cyborg. Increases ship speed by 1.25 and grants ^pink;Aether Immunity^reset;.", "shortdescription" : "Cyborg Contract", "twoHanded" : true, diff --git a/items/active/crewcontracts/crewcontract_janitor.activeitem b/items/active/crewcontracts/crewcontract_janitor.activeitem index 015eb4a7ffa..97bcdc13c53 100644 --- a/items/active/crewcontracts/crewcontract_janitor.activeitem +++ b/items/active/crewcontracts/crewcontract_janitor.activeitem @@ -6,7 +6,7 @@ "maxStack" : 1, "rarity" : "Common", "category" : "crewcontract", - "description" : "Has a mop. Sweeps. ^cyan;Reduces ship mass by 10%^reset;.", + "description" : "Has a mop. Sweeps.", "shortdescription" : "Custodian Contract", "twoHanded" : true, diff --git a/items/active/crewcontracts/crewcontract_mechanic.activeitem b/items/active/crewcontracts/crewcontract_mechanic.activeitem index 7d68b64e246..1557ac5a7e7 100644 --- a/items/active/crewcontracts/crewcontract_mechanic.activeitem +++ b/items/active/crewcontracts/crewcontract_mechanic.activeitem @@ -6,7 +6,7 @@ "maxStack" : 1, "rarity" : "Uncommon", "category" : "crewcontract", - "description" : "Hires a mechanic to ^cyan;reduce ship mass by 20%^reset; and fuel costs by 10%. Also provides special coffee.", + "description" : "Hires a mechanic to ^cyan;reduce fuel costs by 10%^reset;. Also provides special coffee.", "shortdescription" : "Mechanic Contract", "twoHanded" : true, diff --git a/items/active/crewcontracts/crewcontract_mechanic2.activeitem b/items/active/crewcontracts/crewcontract_mechanic2.activeitem index 49ba2f4dae1..07c5d57485d 100644 --- a/items/active/crewcontracts/crewcontract_mechanic2.activeitem +++ b/items/active/crewcontracts/crewcontract_mechanic2.activeitem @@ -6,7 +6,7 @@ "maxStack" : 1, "rarity" : "Rare", "category" : "crewcontract", - "description" : "Reduces fuel costs by 20% and ^cyan;decreases ship mass by 20%^reset;. Also provides extra special coffee.", + "description" : "Reduces fuel costs by 20%. Also provides extra special coffee.", "shortdescription" : "Mechanic II Contract", "twoHanded" : true, diff --git a/items/active/crewcontracts/crewcontract_volcanologist.activeitem b/items/active/crewcontracts/crewcontract_volcanologist.activeitem index 6887f6af14d..62f7cea1243 100644 --- a/items/active/crewcontracts/crewcontract_volcanologist.activeitem +++ b/items/active/crewcontracts/crewcontract_volcanologist.activeitem @@ -6,7 +6,7 @@ "maxStack" : 1, "rarity" : "Legendary", "category" : "crewcontract", - "description" : "Hires a volcanologist to provide ^red;30% Fire resistance^reset; and ^cyan;reduce ship mass by 20%^reset;.", + "description" : "Hires a volcanologist to provide ^red;30% Fire resistance^reset;.", "shortdescription" : "Volcanologist Contract", "twoHanded" : true, diff --git a/items/armors/tier2/lunariarmor/lunari.chest b/items/armors/tier2/lunariarmor/lunari.chest index 42b3662cce2..c3645993f63 100644 --- a/items/armors/tier2/lunariarmor/lunari.chest +++ b/items/armors/tier2/lunariarmor/lunari.chest @@ -5,7 +5,6 @@ "maxStack": 1, "rarity": "Common", "description": "^orange;Set Bonuses^reset;: -^yellow;^reset; -^green;10^reset;% Ship Fuel Cost^reset; ^yellow;^reset; +^green;12^reset;% Energy Regen ^yellow;^reset; Lunari weapons: Damage x^green;1.15^reset;, +^green;4^reset;% Crit Chance", diff --git a/items/armors/tier2/lunariarmor/lunari.head b/items/armors/tier2/lunariarmor/lunari.head index d0484ae27b5..c1ded181a7d 100644 --- a/items/armors/tier2/lunariarmor/lunari.head +++ b/items/armors/tier2/lunariarmor/lunari.head @@ -5,7 +5,6 @@ "maxStack": 1, "rarity": "Common", "description": "^orange;Set Bonuses^reset;: -^yellow;^reset; -^green;10^reset;% Ship Fuel Cost^reset; ^yellow;^reset; +^green;12^reset;% Energy Regen ^yellow;^reset; Lunari weapons: Damage x^green;1.15^reset;, +^green;4^reset;% Crit Chance", diff --git a/items/armors/tier2/lunariarmor/lunari.legs b/items/armors/tier2/lunariarmor/lunari.legs index 65c59d45eff..465a3b98012 100644 --- a/items/armors/tier2/lunariarmor/lunari.legs +++ b/items/armors/tier2/lunariarmor/lunari.legs @@ -5,7 +5,6 @@ "maxStack": 1, "rarity": "Common", "description": "^orange;Set Bonuses^reset;: -^yellow;^reset; -^green;10^reset;% Ship Fuel Cost^reset; ^yellow;^reset; +^green;12^reset;% Energy Regen ^yellow;^reset; Lunari weapons: Damage x^green;1.15^reset;, +^green;4^reset;% Crit Chance", diff --git a/items/armors/tier4/intersec/kirhostier4.chest b/items/armors/tier4/intersec/kirhostier4.chest index ac1236b2961..f90f3aa6e5c 100644 --- a/items/armors/tier4/intersec/kirhostier4.chest +++ b/items/armors/tier4/intersec/kirhostier4.chest @@ -5,7 +5,6 @@ "maxStack" : 1, "rarity" : "rare", "description" : "^orange;Set Bonuses^reset;: -^yellow;^reset; -^green;15^reset;% Ship Mass^reset;^reset; ^yellow;^reset; Assault Rifle, Pistol: +^green;2^reset;% Crit Chance, +^green;25^reset;% Crit Damage", "shortdescription" : "Intersec Breastplate", "category" : "chestarmour", diff --git a/items/armors/tier4/intersec/kirhostier4.head b/items/armors/tier4/intersec/kirhostier4.head index 2cdc04d3faa..2018c59ce06 100644 --- a/items/armors/tier4/intersec/kirhostier4.head +++ b/items/armors/tier4/intersec/kirhostier4.head @@ -5,7 +5,6 @@ "maxStack" : 1, "rarity" : "rare", "description" : "^orange;Set Bonuses^reset;: -^yellow;^reset; -^green;15^reset;% Ship Mass^reset;^reset; ^yellow;^reset; Assault Rifle, Pistol: +^green;2^reset;% Crit Chance, +^green;25^reset;% Crit Damage", "shortdescription" : "Intersec Helmet", "category" : "headarmour", diff --git a/items/armors/tier4/intersec/kirhostier4.legs b/items/armors/tier4/intersec/kirhostier4.legs index 1199b8c8801..ff829d4565c 100644 --- a/items/armors/tier4/intersec/kirhostier4.legs +++ b/items/armors/tier4/intersec/kirhostier4.legs @@ -5,7 +5,6 @@ "maxStack" : 1, "rarity" : "rare", "description" : "^orange;Set Bonuses^reset;: -^yellow;^reset; -^green;15^reset;% Ship Mass^reset;^reset; ^yellow;^reset; Assault Rifle, Pistol: +^green;2^reset;% Crit Chance, +^green;25^reset;% Crit Damage", "shortdescription" : "Intersec Greaves", "category" : "legarmour", diff --git a/npcs/crew/crewmembercyborg.npctype b/npcs/crew/crewmembercyborg.npctype index e296c206b2d..4ccc53c4e10 100644 --- a/npcs/crew/crewmembercyborg.npctype +++ b/npcs/crew/crewmembercyborg.npctype @@ -27,10 +27,6 @@ "type" : "EphemeralEffect", "effect" : "aetherimmunity", "duration" : 300 - }, - { - "type" : "PersistentEffect", - "effect" : "shipMassSmall" } ] } diff --git a/npcs/crew/crewmembergreg.npctype b/npcs/crew/crewmembergreg.npctype index 65f71f2bfad..397bf7e486b 100644 --- a/npcs/crew/crewmembergreg.npctype +++ b/npcs/crew/crewmembergreg.npctype @@ -25,10 +25,6 @@ "defenseAmount" : 6, "duration" : 300 }, - { - "type" : "PersistentEffect", - "effect" : "shipMassLarge" - }, { "type": "ShipUpgradeBenefit", "property": "maxFuel", diff --git a/npcs/crew/crewmemberjanitor.npctype b/npcs/crew/crewmemberjanitor.npctype index 225d0089c68..d3aecf07a12 100644 --- a/npcs/crew/crewmemberjanitor.npctype +++ b/npcs/crew/crewmemberjanitor.npctype @@ -11,10 +11,6 @@ "uniformColorIndex" : 11, "benefits" : [ - { - "type": "PersistentEffect", - "effect": "shipMassSmall" - } ] } }, diff --git a/npcs/crew/crewmembermechanic.npctype.patch b/npcs/crew/crewmembermechanic.npctype.patch index f347c748633..ca4899be4dc 100644 --- a/npcs/crew/crewmembermechanic.npctype.patch +++ b/npcs/crew/crewmembermechanic.npctype.patch @@ -1,12 +1,4 @@ [ - [{ - "op": "add", - "path": "/scriptConfig/crew/role/benefits/0", - "value": { - "type": "PersistentEffect", - "effect": "shipMassMed" - } - }], [{ "op": "replace", "path": "/scriptConfig/dialog/crewmember/roleDescription/default/default/0", diff --git a/npcs/crew/crewmembermechanic2.npctype b/npcs/crew/crewmembermechanic2.npctype index 592c90551ae..9640c9cad21 100644 --- a/npcs/crew/crewmembermechanic2.npctype +++ b/npcs/crew/crewmembermechanic2.npctype @@ -12,10 +12,7 @@ "field": "Technical", "uniformColorIndex": 8, - "benefits": [{ - "type": "PersistentEffect", - "effect": "shipMassMed" - }, + "benefits": [ { "type": "ShipUpgradeBenefit", "property": "fuelEfficiency", @@ -36,7 +33,7 @@ "roleDescription": { "default": { "default": [ - "I'll keep clearing out the carborator while I'm here. Fuel costs are down by 20% and ^cyan;Ship Mass has decreased by 20%^reset;." + "I'll keep clearing out the carborator while I'm here. Fuel costs are down by 20%." ] } }, diff --git a/npcs/crew/crewmembervolcanologist.npctype b/npcs/crew/crewmembervolcanologist.npctype index 2d710bad1d1..bba23a4a366 100644 --- a/npcs/crew/crewmembervolcanologist.npctype +++ b/npcs/crew/crewmembervolcanologist.npctype @@ -22,10 +22,6 @@ "type" : "EphemeralEffect", "effect" : "fireblock3", "duration" : 900 - }, - { - "type" : "PersistentEffect", - "effect" : "shipMassMed" } ] } diff --git a/objects/ship/fu_ftlBooster_large/fu_ftlBooster_large.object b/objects/ship/fu_ftlBooster_large/fu_ftlBooster_large.object index 29ecebfbee0..d6ae77f019c 100644 --- a/objects/ship/fu_ftlBooster_large/fu_ftlBooster_large.object +++ b/objects/ship/fu_ftlBooster_large/fu_ftlBooster_large.object @@ -3,7 +3,7 @@ "colonyTags": ["byos"], "scannable": false, "rarity": "uncommon", - "description": "A thruster used for FTL travel.\n^yellow;Ship Mass: -10\n^cyan;BYOS Only^reset;", + "description": "A thruster used for FTL travel.\n^cyan;BYOS Only^reset;", "shortdescription": "Large FTL Booster", "race": "generic", "apexDescription": "A booster. These have been known to malfunction and explode.", @@ -33,13 +33,9 @@ "animation": "/objects/ship/boosters/boosterflame.animation", "soundEffect": "/sfx/objects/boosterflame.ogg", "scripts": [ - "/objects/ship/boosters/boosterflame.lua", - "/objects/ship/fu_shipstatmodifier.lua" + "/objects/ship/boosters/boosterflame.lua" ], "scriptDelta": 60, - "stats": { - "shipMass": -10 - }, "flyingBoosterStates": { "none": "off", "disembarking": "off", @@ -59,4 +55,4 @@ "damageSourceKind": "plasma" }, "byosOnly": true -} \ No newline at end of file +} diff --git a/objects/ship/fu_ftlBooster_medium/fu_ftlBooster_medium.object b/objects/ship/fu_ftlBooster_medium/fu_ftlBooster_medium.object index c7734769e4b..fc9a0b729f7 100644 --- a/objects/ship/fu_ftlBooster_medium/fu_ftlBooster_medium.object +++ b/objects/ship/fu_ftlBooster_medium/fu_ftlBooster_medium.object @@ -3,7 +3,7 @@ "colonyTags": ["byos"], "scannable": false, "rarity": "common", - "description": "A thruster used for FTL travel.\n^yellow;Ship Mass: -6\n^cyan;BYOS Only^reset;", + "description": "A thruster used for FTL travel.\n^cyan;BYOS Only^reset;", "shortdescription": "Medium FTL Booster", "race": "generic", "apexDescription": "A booster. These have been known to malfunction and explode.", @@ -33,13 +33,9 @@ "animation": "/objects/ship/boosters/boosterflame.animation", "soundEffect": "/sfx/objects/boosterflame.ogg", "scripts": [ - "/objects/ship/boosters/boosterflame.lua", - "/objects/ship/fu_shipstatmodifier.lua" + "/objects/ship/boosters/boosterflame.lua" ], "scriptDelta": 60, - "stats": { - "shipMass": -6 - }, "flyingBoosterStates": { "none": "off", "disembarking": "off", @@ -59,4 +55,4 @@ "damageSourceKind": "plasma" }, "byosOnly": true -} \ No newline at end of file +} diff --git a/objects/ship/fu_ftlBooster_small/fu_ftlBooster_small.object b/objects/ship/fu_ftlBooster_small/fu_ftlBooster_small.object index 1f04e0c98bf..69178942be2 100644 --- a/objects/ship/fu_ftlBooster_small/fu_ftlBooster_small.object +++ b/objects/ship/fu_ftlBooster_small/fu_ftlBooster_small.object @@ -3,7 +3,7 @@ "colonyTags": ["byos"], "scannable": false, "rarity": "common", - "description": "A thruster used for FTL travel.\n^yellow;Ship Mass: -4\n^cyan;BYOS Only^reset;", + "description": "A thruster used for FTL travel.\n^cyan;BYOS Only^reset;", "shortdescription": "Small FTL Booster", "race": "generic", "apexDescription": "A booster. These have been known to malfunction and explode.", @@ -33,13 +33,9 @@ "animation": "/objects/ship/boosters/boosterflame.animation", "soundEffect": "/sfx/objects/boosterflame.ogg", "scripts": [ - "/objects/ship/boosters/boosterflame.lua", - "/objects/ship/fu_shipstatmodifier.lua" + "/objects/ship/boosters/boosterflame.lua" ], "scriptDelta": 60, - "stats": { - "shipMass": -4 - }, "flyingBoosterStates": { "none": "off", "disembarking": "off", @@ -59,4 +55,4 @@ "damageSourceKind": "plasma" }, "byosOnly": true -} \ No newline at end of file +} diff --git a/objects/ship/fu_ftldrive/fu_ftl_human.object b/objects/ship/fu_ftldrive/fu_ftl_human.object index b3b883cfddf..3adf51bece7 100644 --- a/objects/ship/fu_ftldrive/fu_ftl_human.object +++ b/objects/ship/fu_ftldrive/fu_ftl_human.object @@ -3,7 +3,7 @@ "rarity": "essential", "colonyTags": ["science"], "category": "furniture", - "description": "An FTL drive for Human space ships. Allows interstellar travel.\n^yellow;Ship Speed: +15, Ship Mass: +3.25^reset;. ^red;BYOS Only^reset;", + "description": "An FTL drive for Human space ships. Allows interstellar travel.\n^yellow;Ship Speed: +15^reset;. ^red;BYOS Only^reset;", "shortdescription": "^cyan;Human FTL Drive Mk1^reset;", "race": "human", "printable": false, @@ -29,8 +29,7 @@ "scriptDelta": 60, "stats": { - "shipSpeed": 15, - "shipMass": 3.25 + "shipSpeed": 15 }, "capabilities": [ "systemTravel", @@ -40,4 +39,4 @@ "ftlDrive": 1 }, "byosOnly": true -} \ No newline at end of file +} diff --git a/objects/ship/fu_ftldrive/fu_ftl_humanUpgrade.object b/objects/ship/fu_ftldrive/fu_ftl_humanUpgrade.object index f5a4715bc36..8377da2fbc5 100644 --- a/objects/ship/fu_ftldrive/fu_ftl_humanUpgrade.object +++ b/objects/ship/fu_ftldrive/fu_ftl_humanUpgrade.object @@ -3,7 +3,7 @@ "rarity": "essential", "colonyTags": ["science"], "category": "furniture", - "description": "An FTL drive for Human space ships. Allows faster interstellar travel.\n^yellow;Ship Speed: +30, Ship Mass: +3.5^reset;. ^red;BYOS Only^reset;", + "description": "An FTL drive for Human space ships. Allows faster interstellar travel.\n^yellow;Ship Speed: +30^reset;. ^red;BYOS Only^reset;", "shortdescription": "^cyan;Human FTL Drive Mk2^reset;", "race": "human", "printable": false, @@ -28,8 +28,7 @@ "scriptDelta": 60, "stats": { - "shipSpeed": 30, - "shipMass": 3.5 + "shipSpeed": 30 }, "capabilities": [ "systemTravel", @@ -39,4 +38,4 @@ "ftlDrive": 1 }, "byosOnly": true -} \ No newline at end of file +} diff --git a/objects/ship/fu_ftldrive/fu_ftldrivemk1a.object b/objects/ship/fu_ftldrive/fu_ftldrivemk1a.object index 959d5beae10..639b470248b 100644 --- a/objects/ship/fu_ftldrive/fu_ftldrivemk1a.object +++ b/objects/ship/fu_ftldrive/fu_ftldrivemk1a.object @@ -3,7 +3,7 @@ "rarity" : "essential", "colonyTags" : [ "science" ], "category" : "furniture", - "description" : "A larger FTL drive for a space ship. Allows interstellar travel. ^orange;Ship Speed: +4, Ship Mass: +3^reset;. ^red;BYOS Only^reset;.", + "description" : "A larger FTL drive for a space ship. Allows interstellar travel. ^orange;Ship Speed: +4^reset;. ^red;BYOS Only^reset;.", "shortdescription" : "^cyan;FTL Drive Mk1a^reset;", "race" : "generic", "printable" : false, @@ -38,8 +38,7 @@ "scriptDelta" : 60, "stats" : { - "shipSpeed" : 4, - "shipMass" : 3 + "shipSpeed" : 4 }, "capabilities" : [ "systemTravel", diff --git a/objects/ship/fu_ftldrive/fu_ftldrivemk1b.object b/objects/ship/fu_ftldrive/fu_ftldrivemk1b.object index b734630dfea..423b4a94083 100644 --- a/objects/ship/fu_ftldrive/fu_ftldrivemk1b.object +++ b/objects/ship/fu_ftldrive/fu_ftldrivemk1b.object @@ -3,7 +3,7 @@ "rarity" : "essential", "colonyTags" : [ "science" ], "category" : "furniture", - "description" : "A larger FTL drive for a space ship. Allows interstellar travel. ^orange;Ship Speed: +4, Ship Mass: +3^reset;. ^red;BYOS Only^reset;.", + "description" : "A larger FTL drive for a space ship. Allows interstellar travel. ^orange;Ship Speed: +4^reset;. ^red;BYOS Only^reset;.", "shortdescription" : "^cyan;FTL Drive Mk1b^reset;", "race" : "generic", "printable" : false, @@ -38,8 +38,7 @@ "scriptDelta" : 60, "stats" : { - "shipSpeed" : 4, - "shipMass" : 3 + "shipSpeed" : 4 }, "capabilities" : [ "systemTravel", diff --git a/objects/ship/fu_ftldrive/fu_ftldrivemk1c.object b/objects/ship/fu_ftldrive/fu_ftldrivemk1c.object index 0d76fe08118..e8d627f758a 100644 --- a/objects/ship/fu_ftldrive/fu_ftldrivemk1c.object +++ b/objects/ship/fu_ftldrive/fu_ftldrivemk1c.object @@ -3,7 +3,7 @@ "rarity" : "essential", "colonyTags" : [ "science" ], "category" : "furniture", - "description" : "A larger FTL drive for a space ship. Allows interstellar travel. ^orange;Ship Speed: +4, Ship Mass: +3^reset;. ^red;BYOS Only^reset;.", + "description" : "A larger FTL drive for a space ship. Allows interstellar travel. ^orange;Ship Speed: +4^reset;. ^red;BYOS Only^reset;.", "shortdescription" : "^cyan;FTL Drive Mk1c^reset;", "race" : "generic", "printable" : false, @@ -38,8 +38,7 @@ "scriptDelta" : 60, "stats" : { - "shipSpeed" : 4, - "shipMass" : 3 + "shipSpeed" : 4 }, "capabilities" : [ "systemTravel", diff --git a/objects/ship/fu_ftldrive/fu_ftldrivemk2a.object b/objects/ship/fu_ftldrive/fu_ftldrivemk2a.object index ea9bc3432be..98347ef7c89 100644 --- a/objects/ship/fu_ftldrive/fu_ftldrivemk2a.object +++ b/objects/ship/fu_ftldrive/fu_ftldrivemk2a.object @@ -3,7 +3,7 @@ "rarity" : "essential", "colonyTags" : [ "science" ], "category" : "furniture", - "description" : "A larger FTL drive for a space ship. Allows interstellar travel. ^orange;Ship Speed: +10, Ship Mass: +3^reset;. ^red;BYOS Only^reset;.", + "description" : "A larger FTL drive for a space ship. Allows interstellar travel. ^orange;Ship Speed: +10^reset;. ^red;BYOS Only^reset;.", "shortdescription" : "^cyan;FTL Drive Mk2a^reset;", "race" : "generic", "printable" : false, @@ -38,8 +38,7 @@ "scriptDelta" : 60, "stats" : { - "shipSpeed" : 10, - "shipMass" : 3 + "shipSpeed" : 10 }, "capabilities" : [ "systemTravel", diff --git a/objects/ship/fu_ftldrive/fu_ftldrivemk2b.object b/objects/ship/fu_ftldrive/fu_ftldrivemk2b.object index 3a01165c1f0..a2f13f0d592 100644 --- a/objects/ship/fu_ftldrive/fu_ftldrivemk2b.object +++ b/objects/ship/fu_ftldrive/fu_ftldrivemk2b.object @@ -3,7 +3,7 @@ "rarity" : "essential", "colonyTags" : [ "science" ], "category" : "furniture", - "description" : "A larger FTL drive for a space ship. Allows interstellar travel. ^orange;Ship Speed: +10, Ship Mass: +3^reset;. ^red;BYOS Only^reset;.", + "description" : "A larger FTL drive for a space ship. Allows interstellar travel. ^orange;Ship Speed: +10^reset;. ^red;BYOS Only^reset;.", "shortdescription" : "^cyan;FTL Drive Mk2b^reset;", "race" : "generic", "printable" : false, @@ -38,8 +38,7 @@ "scriptDelta" : 60, "stats" : { - "shipSpeed" : 10, - "shipMass" : 3 + "shipSpeed" : 10 }, "capabilities" : [ "systemTravel", diff --git a/objects/ship/fu_ftldrive/fu_ftldrivemk2c.object b/objects/ship/fu_ftldrive/fu_ftldrivemk2c.object index f8a7c659b0f..a63db8532e9 100644 --- a/objects/ship/fu_ftldrive/fu_ftldrivemk2c.object +++ b/objects/ship/fu_ftldrive/fu_ftldrivemk2c.object @@ -3,7 +3,7 @@ "rarity" : "essential", "colonyTags" : [ "science" ], "category" : "furniture", - "description" : "A larger FTL drive for a space ship. Allows interstellar travel. ^orange;Ship Speed: +10, Ship Mass: +3^reset;. ^red;BYOS Only^reset;.", + "description" : "A larger FTL drive for a space ship. Allows interstellar travel. ^orange;Ship Speed: +10^reset;. ^red;BYOS Only^reset;.", "shortdescription" : "^cyan;FTL Drive Mk2c^reset;", "race" : "generic", "printable" : false, @@ -38,8 +38,7 @@ "scriptDelta" : 60, "stats" : { - "shipSpeed" : 10, - "shipMass" : 3 + "shipSpeed" : 10 }, "capabilities" : [ "systemTravel", diff --git a/objects/ship/fu_ftldrive/fu_ftldrivemk3a.object b/objects/ship/fu_ftldrive/fu_ftldrivemk3a.object index 0e5723d02a4..02713b8ab46 100644 --- a/objects/ship/fu_ftldrive/fu_ftldrivemk3a.object +++ b/objects/ship/fu_ftldrive/fu_ftldrivemk3a.object @@ -3,7 +3,7 @@ "rarity" : "essential", "colonyTags" : [ "science" ], "category" : "furniture", - "description" : "A larger FTL drive for a space ship. Allows interstellar travel. ^orange;Ship Speed: +25, Ship Mass: +3^reset;. ^red;BYOS Only^reset;.", + "description" : "A larger FTL drive for a space ship. Allows interstellar travel. ^orange;Ship Speed: +25^reset;. ^red;BYOS Only^reset;.", "shortdescription" : "^cyan;FTL Drive Mk3a^reset;", "race" : "generic", "printable" : false, @@ -37,8 +37,7 @@ "scriptDelta" : 60, "stats" : { - "shipSpeed" : 25, - "shipMass" : 3 + "shipSpeed" : 25 }, "capabilities" : [ "systemTravel", @@ -48,4 +47,4 @@ "ftlDrive" : 1 }, "byosOnly" : true -} \ No newline at end of file +} diff --git a/objects/ship/fu_ftldrive/fu_ftldrivemk3b.object b/objects/ship/fu_ftldrive/fu_ftldrivemk3b.object index fbcc439c7dd..e26f382656f 100644 --- a/objects/ship/fu_ftldrive/fu_ftldrivemk3b.object +++ b/objects/ship/fu_ftldrive/fu_ftldrivemk3b.object @@ -3,7 +3,7 @@ "rarity" : "essential", "colonyTags" : [ "science" ], "category" : "furniture", - "description" : "A larger FTL drive for a space ship. Allows interstellar travel. ^orange;Ship Speed: +25, Ship Mass: +3^reset;. ^red;BYOS Only^reset;.", + "description" : "A larger FTL drive for a space ship. Allows interstellar travel. ^orange;Ship Speed: +25^reset;. ^red;BYOS Only^reset;.", "shortdescription" : "^cyan;FTL Drive Mk3b^reset;", "race" : "generic", "printable" : false, @@ -37,8 +37,7 @@ "scriptDelta" : 60, "stats" : { - "shipSpeed" : 25, - "shipMass" : 3 + "shipSpeed" : 25 }, "capabilities" : [ "systemTravel", diff --git a/objects/ship/fu_ftldrive/fu_ftldrivemk3c.object b/objects/ship/fu_ftldrive/fu_ftldrivemk3c.object index 995fb2fae67..22c8b19ecfb 100644 --- a/objects/ship/fu_ftldrive/fu_ftldrivemk3c.object +++ b/objects/ship/fu_ftldrive/fu_ftldrivemk3c.object @@ -3,7 +3,7 @@ "rarity" : "essential", "colonyTags" : [ "science" ], "category" : "furniture", - "description" : "A larger FTL drive for a space ship. Allows interstellar travel. ^orange;Ship Speed: +25, Ship Mass: +3^reset;. ^red;BYOS Only^reset;.", + "description" : "A larger FTL drive for a space ship. Allows interstellar travel. ^orange;Ship Speed: +25^reset;. ^red;BYOS Only^reset;.", "shortdescription" : "^cyan;FTL Drive Mk3c^reset;", "race" : "generic", "printable" : false, @@ -37,8 +37,7 @@ "scriptDelta" : 60, "stats" : { - "shipSpeed" : 25, - "shipMass" : 3 + "shipSpeed" : 25 }, "capabilities" : [ "systemTravel", diff --git a/objects/ship/fu_ftldrive/fu_ftldrivesmall.object b/objects/ship/fu_ftldrive/fu_ftldrivesmall.object index f9a2440fb52..9958c4d9c36 100644 --- a/objects/ship/fu_ftldrive/fu_ftldrivesmall.object +++ b/objects/ship/fu_ftldrive/fu_ftldrivesmall.object @@ -3,7 +3,7 @@ "rarity" : "essential", "colonyTags" : [ "science" ], "category" : "furniture", - "description" : "An FTL drive for a space ship. Allows interstellar travel and STL travel. ^orange;Ship Speed: +3, Ship Mass: +1^reset;. ^red;BYOS Only^reset;", + "description" : "An FTL drive for a space ship. Allows interstellar travel and STL travel. ^orange;Ship Speed: +3^reset;. ^red;BYOS Only^reset;", "shortdescription" : "^cyan;Small FTL Drive^reset;", "race" : "generic", "printable" : false, @@ -38,8 +38,7 @@ "scriptDelta" : 60, "stats" : { - "shipSpeed" : 3, - "shipMass" : 1 + "shipSpeed" : 3 }, "capabilities" : [ "systemTravel", diff --git a/objects/ship/fu_ftldrive/fu_stldrive.object b/objects/ship/fu_ftldrive/fu_stldrive.object index 5a5e6e65e90..f73034253b0 100644 --- a/objects/ship/fu_ftldrive/fu_stldrive.object +++ b/objects/ship/fu_ftldrive/fu_stldrive.object @@ -3,7 +3,7 @@ "rarity" : "essential", "colonyTags" : [ "science" ], "category" : "furniture", - "description" : "An STL drive for a space ship. Allows travel within a system, but isn't strong enough to travel to others.\n^orange;Ship Mass: +1^reset;. ^red;BYOS Only^reset;", + "description" : "An STL drive for a space ship. Allows travel within a system, but isn't strong enough to travel to others.\n^red;BYOS Only^reset;", "shortdescription" : "^red;STL Drive^reset;", "race" : "generic", "printable" : false, @@ -37,8 +37,7 @@ "scriptDelta" : 60, "stats" : { - "shipSpeed" : -20, - "shipMass" : 1 + "shipSpeed" : -20 }, "capabilities" : [ "planetTravel" diff --git a/objects/ship/fu_sciencefuelhatch/fu_byosstatreset.object b/objects/ship/fu_sciencefuelhatch/fu_byosstatreset.object index 22a01fa16fe..7c46ecc8378 100644 --- a/objects/ship/fu_sciencefuelhatch/fu_byosstatreset.object +++ b/objects/ship/fu_sciencefuelhatch/fu_byosstatreset.object @@ -36,7 +36,6 @@ "stats": { "shipSpeed": 0, - "shipMass": 0, "fuelEfficiency" : 0.0, "maxFuel" : 0, "crewSize" : 0 @@ -48,4 +47,4 @@ "maxAmountGroups": { "ftlDrive": 0 } -} \ No newline at end of file +} diff --git a/player.config.patch b/player.config.patch index 934599a5527..a77471cc2b0 100644 --- a/player.config.patch +++ b/player.config.patch @@ -89,9 +89,6 @@ //start statuscontrollersettings - // Ship Mass - [ { "op": "add", "path": "/statusControllerSettings/stats/shipMass", "value": { "baseValue" : 31.4 } } ], - // Space Station Charisma Stat [ { "op": "add", "path": "/statusControllerSettings/stats/fuCharisma", "value": { "baseValue" : 1.00 } } ], [ { "op": "add", "path": "/statusControllerSettings/primaryScriptSources/-", "value": "/stats/player_primary_bars.lua" } ], diff --git a/ships/shipupgrades.config.patch b/ships/shipupgrades.config.patch index 6040ffee8b4..8de2b136e5c 100644 --- a/ships/shipupgrades.config.patch +++ b/ships/shipupgrades.config.patch @@ -1,12 +1,7 @@ [ - { - "op": "add", - "path": "/shipMass", - "value": 10 - }, { "op": "replace", "path": "/maxFuel", "value": 10000 } -] \ No newline at end of file +] diff --git a/stats/__STAT_LIST.TXT b/stats/__STAT_LIST.TXT index 231279fc747..93fe0b8bb5a 100644 --- a/stats/__STAT_LIST.TXT +++ b/stats/__STAT_LIST.TXT @@ -195,7 +195,6 @@ OTHER: pandoraBoxExtraPets [amount] [0-Relative] increase to pet count - shipMass [baseMultiplier] [1-Relative] Affects ship's mass maxFuel [amount] [0-relative. Default: 0] added to base value of max ship fuel fuelEfficiency [amount] [0-relative. Default: 0.0] percentage fuel cost reduction. not actual 'efficiency'. capped at 99%. shipSpeed [amount] [0-relative. Default: 0] flat value increase to ship speed, which is capped around 398 diff --git a/stats/effects/fu_armoreffects/set_bonuses/tier2/lunarisetbonuseffect.lua b/stats/effects/fu_armoreffects/set_bonuses/tier2/lunarisetbonuseffect.lua index 3f0b49c2427..1b566756db3 100644 --- a/stats/effects/fu_armoreffects/set_bonuses/tier2/lunarisetbonuseffect.lua +++ b/stats/effects/fu_armoreffects/set_bonuses/tier2/lunarisetbonuseffect.lua @@ -3,8 +3,7 @@ setName="fu_lunariset" armorBonus={ {stat="energyRegenPercentageRate",baseMultiplier=1.12 }, - {stat="energyRegenBlockTime",baseMultiplier=0.85 }, - {stat="shipMass",baseMultiplier=0.9 } + {stat="energyRegenBlockTime",baseMultiplier=0.85 } } weaponBonus={ @@ -36,4 +35,4 @@ function checkWeapons() else effect.setStatModifierGroup(effectHandlerList.weaponBonus1Handle,{}) end -end \ No newline at end of file +end diff --git a/stats/effects/fu_armoreffects/set_bonuses/tier4/intersecsetbonuseffect.lua b/stats/effects/fu_armoreffects/set_bonuses/tier4/intersecsetbonuseffect.lua index ff677467089..acdddc129e2 100644 --- a/stats/effects/fu_armoreffects/set_bonuses/tier4/intersecsetbonuseffect.lua +++ b/stats/effects/fu_armoreffects/set_bonuses/tier4/intersecsetbonuseffect.lua @@ -7,7 +7,7 @@ weaponBonus={ } armorBonus={ - {stat = "shipMass", baseMultiplier = 0.85} + }