Browse Source
games/pioneer: Updated for version 20250501.
games/pioneer: Updated for version 20250501.
Signed-off-by: Andrew Clemons <andrew.clemons@gmail.com> Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>pull/292/head
committed by
Willy Sudiarto Raharjo
No known key found for this signature in database
GPG Key ID: 3F617144D7238786
5 changed files with 5 additions and 118 deletions
-
84games/pioneer/equipment-efb0077.diff
-
11games/pioneer/hyperdrive-db5330e.diff
-
13games/pioneer/lighting-33158a5.diff
-
9games/pioneer/pioneer.SlackBuild
-
6games/pioneer/pioneer.info
@ -1,84 +0,0 @@ |
|||
diff --git a/data/modules/Equipment/Hyperdrive.lua b/data/modules/Equipment/Hyperdrive.lua
|
|||
index e3c8cd5b5e..fec629107b 100644
|
|||
--- a/data/modules/Equipment/Hyperdrive.lua
|
|||
+++ b/data/modules/Equipment/Hyperdrive.lua
|
|||
@@ -96,7 +96,7 @@ Equipment.Register("hyperspace.hyperdrive_mil3", HyperdriveType.New {
|
|||
slot = { type="hyperdrive.military", size=3 }, |
|||
mass=12.5, volume=15, capabilities={ hyperclass=3 }, |
|||
fuel_resv_size = 10, factor_eff = 60, |
|||
- price=85000, purchasable=true, tech_level=11,
|
|||
+ price=85000, purchasable=true, tech_level="MILITARY",
|
|||
icon_name="equip_hyperdrive_mil" |
|||
}) |
|||
Equipment.Register("hyperspace.hyperdrive_mil4", HyperdriveType.New { |
|||
@@ -104,7 +104,7 @@ Equipment.Register("hyperspace.hyperdrive_mil4", HyperdriveType.New {
|
|||
slot = { type="hyperdrive.military", size=4 }, |
|||
mass=32, volume=40, capabilities={ hyperclass=4 }, |
|||
fuel_resv_size = 30, factor_eff = 48, |
|||
- price=214000, purchasable=true, tech_level=12,
|
|||
+ price=214000, purchasable=true, tech_level="MILITARY",
|
|||
icon_name="equip_hyperdrive_mil" |
|||
}) |
|||
Equipment.Register("hyperspace.hyperdrive_mil5", HyperdriveType.New { |
|||
diff --git a/data/pigui/libs/equipment-outfitter.lua b/data/pigui/libs/equipment-outfitter.lua
|
|||
index 21bbc21a7c..86a08e592f 100644
|
|||
--- a/data/pigui/libs/equipment-outfitter.lua
|
|||
+++ b/data/pigui/libs/equipment-outfitter.lua
|
|||
@@ -196,8 +196,12 @@ end
|
|||
--================== |
|||
|
|||
function Outfitter:stationHasTech(level) |
|||
- level = level == "MILITARY" and 11 or level
|
|||
- return self.station.techLevel >= level
|
|||
+ if level ~= "MILITARY" then
|
|||
+ return self.station.techLevel >= level
|
|||
+ else
|
|||
+ level = 11
|
|||
+ return self.station.techLevel == level
|
|||
+ end
|
|||
end |
|||
|
|||
-- Override to support e.g. custom equipment shops |
|||
@@ -490,8 +494,15 @@ function Outfitter:renderCompareRow(label, stat_a, stat_b)
|
|||
ui.text(label) |
|||
|
|||
local icon_size = Vector2(ui.getTextLineHeight()) |
|||
+ local cmp_a, cmp_b = "", ""
|
|||
+ if stat_a then
|
|||
+ cmp_a = stat_a[3] == "MILITARY" and 11 or stat_a[3]
|
|||
+ end
|
|||
+ if stat_b then
|
|||
+ cmp_b = stat_b[3] == "MILITARY" and 11 or stat_b[3]
|
|||
+ end
|
|||
local color = stat_a and stat_b |
|||
- and compare(stat_a[3], stat_b[3], stat_a[5])
|
|||
+ and compare(cmp_a, cmp_b, stat_a[5])
|
|||
or colors.font |
|||
|
|||
ui.tableNextColumn() |
|||
@@ -500,7 +511,11 @@ function Outfitter:renderCompareRow(label, stat_a, stat_b)
|
|||
ui.sameLine() |
|||
|
|||
local val, format = stat_a[3], stat_a[4] |
|||
- ui.textColored(color, format(val))
|
|||
+ if val ~= "MILITARY" then
|
|||
+ ui.textColored(color, format(val))
|
|||
+ else
|
|||
+ ui.icon(icons.shield_other, icon_size, color)
|
|||
+ end
|
|||
end |
|||
|
|||
ui.tableNextColumn() |
|||
@@ -509,7 +524,11 @@ function Outfitter:renderCompareRow(label, stat_a, stat_b)
|
|||
ui.sameLine() |
|||
|
|||
local val, format = stat_b[3], stat_b[4] |
|||
- ui.text(format(val))
|
|||
+ if val ~= "MILITARY" then
|
|||
+ ui.textColored(color, format(val))
|
|||
+ else
|
|||
+ ui.icon(icons.shield_other, icon_size, color)
|
|||
+ end
|
|||
end |
|||
end |
|||
|
|||
@ -1,11 +0,0 @@ |
|||
--- data/modules/Equipment/Types.lua.old 2025-02-06 12:54:42.346204471 +0900
|
|||
+++ data/modules/Equipment/Types.lua 2025-02-06 13:13:07.126097752 +0900
|
|||
@@ -267,7 +267,7 @@
|
|||
local amount = ship['nextJumpFuelUse'] |
|||
ship:unsetprop('nextJumpFuelUse') |
|||
|
|||
- self.storedFuel = math.max(0, self.storedFuel - amount)
|
|||
+ self:SetFuel(ship, math.max(0, self.storedFuel - amount))
|
|||
|
|||
if self.byproduct then |
|||
local cargoMgr = ship:GetComponent('CargoManager') |
|||
@ -1,13 +0,0 @@ |
|||
diff --git a/src/graphics/opengl/VertexBufferGL.cpp b/src/graphics/opengl/VertexBufferGL.cpp
|
|||
index 3b0b0f2817..a96476f237 100644
|
|||
--- a/src/graphics/opengl/VertexBufferGL.cpp
|
|||
+++ b/src/graphics/opengl/VertexBufferGL.cpp
|
|||
@@ -20,7 +20,7 @@ namespace Graphics {
|
|||
case ATTRIB_NORMAL: return 1; |
|||
case ATTRIB_DIFFUSE: return 2; |
|||
case ATTRIB_UV0: return 3; |
|||
- case ATTRIB_TANGENT: return 4;
|
|||
+ case ATTRIB_TANGENT: return 5;
|
|||
default: |
|||
assert(false); |
|||
return 0; |
|||
Write
Preview
Loading…
Cancel
Save
Reference in new issue