Skip to content

Commit

Permalink
Renamed Unicorp D platings to Exacorp D, added hull tutorial to descr…
Browse files Browse the repository at this point in the history
…iption.

All hulls will be called "hull" from now on, rather than "plating".

The Unicorp X platings, I think I'll rebrand as whatever company
makes the Vendetta et al, to correspond with Nexus selling their own
brand of engines.
  • Loading branch information
onpon4 committed Jun 11, 2024
1 parent e32fd01 commit 7f152b5
Show file tree
Hide file tree
Showing 77 changed files with 105 additions and 110 deletions.
39 changes: 17 additions & 22 deletions dat/factions/equip/generic.lua
Original file line number Diff line number Diff line change
Expand Up @@ -211,86 +211,86 @@ equip_classOutfits_engines = {
-- none should be equipped.
equip_classOutfits_hulls = {
["Yacht"] = {
"Unicorp D-2 Light Plating",
"Exacorp D-2 Hull",
"Unicorp X-2 Light Plating",
},
["Luxury Yacht"] = {
"Unicorp D-2 Light Plating",
"Exacorp D-2 Hull",
"Unicorp X-2 Light Plating",
"S&K Ultralight Stealth Plating",
},
["Scout"] = {
"Unicorp D-2 Light Plating",
"Exacorp D-2 Hull",
"Unicorp X-2 Light Plating",
"S&K Ultralight Stealth Plating",
},
["Courier"] = {
"Unicorp D-4 Light Plating",
"Exacorp D-4 Hull",
"Unicorp X-4 Light Plating",
"S&K Small Cargo Hull",
},
["Freighter"] = {
"Unicorp D-24 Medium Plating",
"Exacorp D-24 Hull",
"Unicorp X-24 Medium Plating",
"S&K Medium Cargo Hull",
},
["Armored Transport"] = {
"Unicorp D-24 Medium Plating",
"Exacorp D-24 Hull",
"Unicorp X-24 Medium Plating",
"S&K Medium Cargo Hull",
},
["Bulk Freighter"] = {
"Unicorp D-72 Heavy Plating",
"Exacorp D-72 Hull",
"Unicorp X-72 Heavy Plating",
"S&K Large Cargo Hull",
},
["Light Fighter"] = {
"Unicorp D-2 Light Plating",
"Exacorp D-2 Hull",
"Unicorp X-2 Light Plating",
"S&K Ultralight Stealth Plating",
"S&K Ultralight Combat Plating",
},
["Fighter"] = {
"Unicorp D-4 Light Plating",
"Exacorp D-4 Hull",
"Unicorp X-4 Light Plating",
"S&K Light Stealth Plating",
"S&K Light Combat Plating"
},
["Bomber"] = {
"Unicorp D-4 Light Plating",
"Exacorp D-4 Hull",
"Unicorp X-4 Light Plating",
"S&K Light Stealth Plating",
"S&K Light Combat Plating"
},
["Corvette"] = {
"Unicorp D-12 Medium Plating",
"Exacorp D-12 Hull",
"Unicorp X-12 Medium Plating",
"S&K Medium Stealth Plating",
"S&K Medium Combat Plating"
},
["Destroyer"] = {
"Unicorp D-24 Medium Plating",
"Exacorp D-24 Hull",
"Unicorp X-24 Medium Plating",
"S&K Medium-Heavy Stealth Plating",
"S&K Medium-Heavy Combat Plating"
},
["Light Cruiser"] = {
"Unicorp D-48 Heavy Plating",
"Exacorp D-48 Hull",
"Unicorp X-48 Heavy Plating",
"S&K Heavy Combat Plating",
},
["Cruiser"] = {
"Unicorp D-48 Heavy Plating",
"Exacorp D-48 Hull",
"Unicorp X-48 Heavy Plating",
"S&K Heavy Combat Plating",
},
["Battleship"] = {
"Unicorp D-72 Heavy Plating",
"Exacorp D-72 Hull",
"Unicorp X-72 Heavy Plating",
"S&K Superheavy Combat Plating",
},
["Carrier"] = {
"Unicorp D-72 Heavy Plating",
"Exacorp D-72 Hull",
"Unicorp X-72 Heavy Plating",
"S&K Superheavy Combat Plating",
},
Expand Down Expand Up @@ -1384,11 +1384,6 @@ equip_typeOutfits_engines = {

-- Table of available hulls by base type.
equip_typeOutfits_hulls = {
["Hyena"] = {
"Unicorp D-2 Light Plating",
"Unicorp X-2 Light Plating",
"S&K Ultralight Stealth Plating",
},
["Brigand"] = {
probability = {
["Ultralight Shell Stage X"] = 2,
Expand Down Expand Up @@ -1884,7 +1879,7 @@ function equip_generic(p, recursive)
success = equip_warn(p, o[rnd.rnd(1, #o)])
end
if not success then
equip_warn(p, "Unicorp D-2 Light Plating")
equip_warn(p, "Exacorp D-2 Hull")
end

-- Weapons
Expand Down
2 changes: 1 addition & 1 deletion dat/factions/equip/mercenary.lua
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ equip_classOutfits_engines["Yacht"] = {
"Tricon Zephyr Engine",
}
equip_classOutfits_hulls["Yacht"] = {
"Unicorp D-2 Light Plating",
"Exacorp D-2 Hull",
"Unicorp X-2 Light Plating",
"S&K Ultralight Stealth Plating",
"S&K Ultralight Combat Plating",
Expand Down
4 changes: 2 additions & 2 deletions dat/missions/tutorial/teenager.lua
Original file line number Diff line number Diff line change
Expand Up @@ -149,9 +149,9 @@ function enter()

target = pilot.add("Gawain", "Civilian", location, _("Credence"),
{naked=true})
target:outfitAdd("Milspec Aegis 3601 Core System")
target:outfitAdd("Milspec Aegis 3201 APU")
target:outfitAdd("Beat Up Small Engine")
target:outfitAdd("Unicorp D-2 Light Plating")
target:outfitAdd("Exacorp D-2 Hull")
target:outfitAdd("Small Shield Booster")
target:outfitAdd("Emergency Shield Booster")
target:outfitAdd("Reactor Class I")
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<?xml version='1.0' encoding='UTF-8'?>
<outfit name="Unicorp D-12 Medium Plating">
<outfit name="Exacorp D-12 Hull">
<general>
<typename>Hull</typename>
<slot prop="hull">structure</slot>
<size>medium</size>
<mass>100</mass>
<price>45000</price>
<description>D-12 plating provides a serviceable layer of armor to medium ships, and doesn't weigh too much.</description>
<description>The hull provides a ship's basic structure. It determines the ship's armor, which is the last line of defense against the hazards of space, as well as cargo space. Every ship must have a hull installed to be spaceworthy.</description>
<gfx_store>base_hull_m.webp</gfx_store>
<priority>3</priority>
</general>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<?xml version='1.0' encoding='UTF-8'?>
<outfit name="Unicorp D-24 Medium Plating">
<outfit name="Exacorp D-24 Hull">
<general>
<typename>Hull</typename>
<slot prop="hull">structure</slot>
<size>medium</size>
<priority>7</priority>
<mass>220</mass>
<price>80000</price>
<description>Unicorp's D-24 plating is similar to D-12 plating, but the armour plates are thicker and built atop an enlarged superstructure, increasing mass, armor, and cargo capacity.</description>
<description>The hull provides a ship's basic structure. It determines the ship's armor, which is the last line of defense against the hazards of space, as well as cargo space. Every ship must have a hull installed to be spaceworthy.</description>
<gfx_store>base_hull_h.webp</gfx_store>
</general>
<specific type="modification">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<?xml version='1.0' encoding='UTF-8'?>
<outfit name="Unicorp D-2 Light Plating">
<outfit name="Exacorp D-2 Hull">
<general>
<typename>Hull</typename>
<slot prop="hull">structure</slot>
<size>small</size>
<mass>27</mass>
<price>16000</price>
<description>Commonly found on civilian vessels, the D-2 plating is popular with ship manufacturers due to its low cost and adequate, if uninspiring performance.</description>
<description>The hull provides a ship's basic structure. It determines the ship's armor, which is the last line of defense against the hazards of space, as well as cargo space. Every ship must have a hull installed to be spaceworthy.</description>
<gfx_store>base_hull_t.webp</gfx_store>
<priority>3</priority>
</general>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<?xml version='1.0' encoding='UTF-8'?>
<outfit name="Unicorp D-48 Heavy Plating">
<outfit name="Exacorp D-48 Hull">
<general>
<typename>Hull</typename>
<slot prop="hull">structure</slot>
<size>large</size>
<mass>800</mass>
<price>280000</price>
<description>Thô a respectable design, the D-48 plating is outclassed by modern heavy weapons, with most seasoned captains opting for a heavier, more advanced plating.</description>
<description>The hull provides a ship's basic structure. It determines the ship's armor, which is the last line of defense against the hazards of space, as well as cargo space. Every ship must have a hull installed to be spaceworthy.</description>
<gfx_store>base_hull_l.webp</gfx_store>
<priority>3</priority>
</general>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<?xml version='1.0' encoding='UTF-8'?>
<outfit name="Unicorp D-4 Light Plating">
<outfit name="Exacorp D-4 Hull">
<general>
<typename>Hull</typename>
<slot prop="hull">structure</slot>
<size>small</size>
<priority>7</priority>
<mass>55</mass>
<price>30000</price>
<description>Commonly found on civilian vessels, the D-4 plating is popular with ship manufacturers due to its low cost and adequate, if uninspiring performance.</description>
<description>The hull provides a ship's basic structure. It determines the ship's armor, which is the last line of defense against the hazards of space, as well as cargo space. Every ship must have a hull installed to be spaceworthy.</description>
<gfx_store>base_hull_s.webp</gfx_store>
</general>
<specific type="modification">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<?xml version='1.0' encoding='UTF-8'?>
<outfit name="Unicorp D-72 Heavy Plating">
<outfit name="Exacorp D-72 Hull">
<general>
<typename>Hull</typename>
<slot prop="hull">structure</slot>
<size>large</size>
<priority>7</priority>
<mass>1350</mass>
<price>360000</price>
<description>Thô a respectable design, the D-72 plating is outclassed by modern heavy weapons, with most seasoned captains opting for a heavier, more advanced plating.</description>
<description>The hull provides a ship's basic structure. It determines the ship's armor, which is the last line of defense against the hazards of space, as well as cargo space. Every ship must have a hull installed to be spaceworthy.</description>
<gfx_store>base_hull_x.webp</gfx_store>
</general>
<specific type="modification">
Expand Down
2 changes: 1 addition & 1 deletion dat/ships/admonisher.xml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
<utility size="medium" />
<utility size="small" />
<structure size="medium" prop="engines" exclusive="1" required="1">Exacorp Arrow 700 Engine</structure>
<structure size="medium" prop="hull" exclusive="1" required="1">Unicorp D-12 Medium Plating</structure>
<structure size="medium" prop="hull" exclusive="1" required="1">Exacorp D-12 Hull</structure>
<structure size="medium" />
<structure size="medium" />
<structure size="medium" />
Expand Down
2 changes: 1 addition & 1 deletion dat/ships/ancestor.xml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
<utility size="small" />
<utility size="small" />
<structure size="small" prop="engines" exclusive="1" required="1">Exacorp Hawk 300 Engine</structure>
<structure size="small" prop="hull" exclusive="1" required="1">Unicorp D-4 Light Plating</structure>
<structure size="small" prop="hull" exclusive="1" required="1">Exacorp D-4 Hull</structure>
<structure size="small" />
</slots>
<stats>
Expand Down
2 changes: 1 addition & 1 deletion dat/ships/drone.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<utility size="small" prop="systems" exclusive="1" required="1">Exacorp ET-200 APU</utility>
<utility size="small" />
<structure size="small" prop="engines" exclusive="1" required="1">Exacorp Dart 150 Engine</structure>
<structure size="small" prop="hull" exclusive="1" required="1">Unicorp D-2 Light Plating</structure>
<structure size="small" prop="hull" exclusive="1" required="1">Exacorp D-2 Hull</structure>
<structure size="small" />
</slots>
<stats>
Expand Down
2 changes: 1 addition & 1 deletion dat/ships/drone_heavy.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
<utility size="small" />
<utility size="small" />
<structure size="small" prop="engines" exclusive="1" required="1">Exacorp Hawk 300 Engine</structure>
<structure size="small" prop="hull" exclusive="1" required="1">Unicorp D-4 Light Plating</structure>
<structure size="small" prop="hull" exclusive="1" required="1">Exacorp D-4 Hull</structure>
<structure size="small" />
<structure size="small" />
<structure size="small" />
Expand Down
2 changes: 1 addition & 1 deletion dat/ships/dvaered_ancestor.xml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
<utility size="small" />
<utility size="small" />
<structure size="small" prop="engines" exclusive="1" required="1">Exacorp Hawk 300 Engine</structure>
<structure size="small" prop="hull" exclusive="1" required="1">Unicorp D-4 Light Plating</structure>
<structure size="small" prop="hull" exclusive="1" required="1">Exacorp D-4 Hull</structure>
<structure size="small" />
</slots>
<stats>
Expand Down
2 changes: 1 addition & 1 deletion dat/ships/dvaered_goddard.xml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
<utility size="large" />
<utility size="large" />
<structure size="large" prop="engines" exclusive="1" required="1">Exacorp Eagle 6500 Engine</structure>
<structure size="large" prop="hull" exclusive="1" required="1">Unicorp D-72 Heavy Plating</structure>
<structure size="large" prop="hull" exclusive="1" required="1">Exacorp D-72 Hull</structure>
<structure size="large" />
<structure size="large" />
<structure size="large" />
Expand Down
2 changes: 1 addition & 1 deletion dat/ships/dvaered_phalanx.xml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
<utility size="medium" />
<utility size="small" />
<structure size="medium" prop="engines" exclusive="1" required="1">Exacorp Arrow 700 Engine</structure>
<structure size="medium" prop="hull" exclusive="1" required="1">Unicorp D-12 Medium Plating</structure>
<structure size="medium" prop="hull" exclusive="1" required="1">Exacorp D-12 Hull</structure>
<structure size="medium" />
<structure size="medium" />
<structure size="medium" />
Expand Down
2 changes: 1 addition & 1 deletion dat/ships/dvaered_vendetta.xml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
<utility size="small" prop="systems" exclusive="1" required="1">Exacorp ET-300 APU</utility>
<utility size="small" />
<structure size="small" prop="engines" exclusive="1" required="1">Exacorp Hawk 300 Engine</structure>
<structure size="small" prop="hull" exclusive="1" required="1">Unicorp D-4 Light Plating</structure>
<structure size="small" prop="hull" exclusive="1" required="1">Exacorp D-4 Hull</structure>
<structure size="small" />
</slots>
<stats>
Expand Down
2 changes: 1 addition & 1 deletion dat/ships/dvaered_vigilance.xml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
<utility size="large" />
<utility size="medium" />
<structure size="medium" prop="engines" exclusive="1" required="1">Exacorp Falcon 1200 Engine</structure>
<structure size="medium" prop="hull" exclusive="1" required="1">Unicorp D-24 Medium Plating</structure>
<structure size="medium" prop="hull" exclusive="1" required="1">Exacorp D-24 Hull</structure>
<structure size="large" />
<structure size="medium" />
<structure size="medium" />
Expand Down
2 changes: 1 addition & 1 deletion dat/ships/elephant.xml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
<utility size="medium" />
<utility size="medium" />
<structure size="large" prop="engines" exclusive="1" required="1">Exacorp Eagle 6500 Engine</structure>
<structure size="large" prop="hull" exclusive="1" required="1">Unicorp D-72 Heavy Plating</structure>
<structure size="large" prop="hull" exclusive="1" required="1">Exacorp D-72 Hull</structure>
<structure size="large" />
<structure size="large" />
<structure size="large" />
Expand Down
2 changes: 1 addition & 1 deletion dat/ships/gawain.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
<utility size="small" />
<utility size="small" />
<structure size="small" prop="engines" exclusive="1" required="1">Exacorp Dart 150 Engine</structure>
<structure size="small" prop="hull" exclusive="1" required="1">Unicorp D-2 Light Plating</structure>
<structure size="small" prop="hull" exclusive="1" required="1">Exacorp D-2 Hull</structure>
<structure size="small" />
<structure size="small" />
</slots>
Expand Down
2 changes: 1 addition & 1 deletion dat/ships/goddard.xml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
<utility size="large" />
<utility size="large" />
<structure size="large" prop="engines" exclusive="1" required="1">Exacorp Eagle 6500 Engine</structure>
<structure size="large" prop="hull" exclusive="1" required="1">Unicorp D-72 Heavy Plating</structure>
<structure size="large" prop="hull" exclusive="1" required="1">Exacorp D-72 Hull</structure>
<structure size="large" />
<structure size="large" />
<structure size="large" />
Expand Down
2 changes: 1 addition & 1 deletion dat/ships/hawking.xml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
<utility size="large" />
<utility size="large" />
<structure size="large" prop="engines" exclusive="1" required="1">Exacorp Bolt 4500 Engine</structure>
<structure size="large" prop="hull" exclusive="1" required="1">Unicorp D-48 Heavy Plating</structure>
<structure size="large" prop="hull" exclusive="1" required="1">Exacorp D-48 Hull</structure>
<structure size="large" />
<structure size="large" />
<structure size="large" />
Expand Down
2 changes: 1 addition & 1 deletion dat/ships/hyena.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<utility size="small" prop="systems" exclusive="1" required="1">Exacorp ET-200 APU</utility>
<utility size="small" />
<structure size="small" prop="engines" exclusive="1" required="1">Exacorp Dart 150 Engine</structure>
<structure size="small" prop="hull" exclusive="1" required="1">Unicorp D-2 Light Plating</structure>
<structure size="small" prop="hull" exclusive="1" required="1">Exacorp D-2 Hull</structure>
<structure size="small" />
</slots>
<stats>
Expand Down
2 changes: 1 addition & 1 deletion dat/ships/imperial_admonisher.xml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
<utility size="medium" />
<utility size="small" />
<structure size="medium" prop="engines" exclusive="1" required="1">Exacorp Arrow 700 Engine</structure>
<structure size="medium" prop="hull" exclusive="1" required="1">Unicorp D-12 Medium Plating</structure>
<structure size="medium" prop="hull" exclusive="1" required="1">Exacorp D-12 Hull</structure>
<structure size="medium" />
<structure size="medium" />
<structure size="medium" />
Expand Down
2 changes: 1 addition & 1 deletion dat/ships/imperial_hawking.xml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
<utility size="large" />
<utility size="large" />
<structure size="large" prop="engines" exclusive="1" required="1">Exacorp Bolt 4500 Engine</structure>
<structure size="large" prop="hull" exclusive="1" required="1">Unicorp D-48 Heavy Plating</structure>
<structure size="large" prop="hull" exclusive="1" required="1">Exacorp D-48 Hull</structure>
<structure size="large" />
<structure size="large" />
<structure size="large" />
Expand Down
2 changes: 1 addition & 1 deletion dat/ships/imperial_lancelot.xml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
<utility size="small" />
<utility size="small" />
<structure size="small" prop="engines" exclusive="1" required="1">Exacorp Hawk 300 Engine</structure>
<structure size="small" prop="hull" exclusive="1" required="1">Unicorp D-4 Light Plating</structure>
<structure size="small" prop="hull" exclusive="1" required="1">Exacorp D-4 Hull</structure>
<structure size="small" />
<structure size="small" />
</slots>
Expand Down
2 changes: 1 addition & 1 deletion dat/ships/imperial_pacifier.xml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
<utility size="medium" />
<utility size="medium" />
<structure size="medium" prop="engines" exclusive="1" required="1">Exacorp Falcon 1200 Engine</structure>
<structure size="medium" prop="hull" exclusive="1" required="1">Unicorp D-24 Medium Plating</structure>
<structure size="medium" prop="hull" exclusive="1" required="1">Exacorp D-24 Hull</structure>
<structure size="large" />
<structure size="medium" />
<structure size="medium" />
Expand Down
Loading

0 comments on commit 7f152b5

Please sign in to comment.