Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Za'lek Cores and Outfit Rework #2027

Draft
wants to merge 35 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
f43cfae
Partial rework of za'lek outfits with a focus on the za'lek sting.
bobbens Jan 26, 2022
9dc67f1
Added core outfits meant for the Za'lek demon.
bobbens Jan 26, 2022
37718d2
Tweaked demon core.
bobbens Jan 26, 2022
f2909ce
Merge branch 'main' into zlk
bobbens Jan 27, 2022
81af840
Tweaked za'lek mini bay mass and demon kernel and mass.
bobbens Jan 27, 2022
fc4c93d
Increases heavy-medium core systems mass by 70 and lowere destroyer mass
bobbens Jan 27, 2022
f812559
Initial addition of the large za'lek cores.
bobbens Jan 27, 2022
769960e
Add small bonus and penalty to medium za'lek kernels/drives.
bobbens Jan 27, 2022
cd86bb3
Increased grave beam energy usage.
bobbens Jan 27, 2022
f8c8064
Got it wrong way around.
bobbens Jan 27, 2022
ee6ef58
Modify cpu capacity instead of giving cpu cost.
bobbens Jan 27, 2022
4ff272b
Tell autoequip that black cat doll isn't as good as it seems.
bobbens Jan 27, 2022
4aa7c9e
Renamed things to be a bit mor esensible.
bobbens Jan 27, 2022
18e7cb5
Add the new cores to Zied.
bobbens Jan 27, 2022
844cf9e
Lowered mule and rhino mass like destroyers.
bobbens Jan 27, 2022
9fdaa0b
Partial rework of za'lek outfits with a focus on the za'lek sting.
bobbens Jan 26, 2022
8c20dc3
Added core outfits meant for the Za'lek demon.
bobbens Jan 26, 2022
5e2df0b
Tweaked demon core.
bobbens Jan 26, 2022
0fc46d8
Tweaked za'lek mini bay mass and demon kernel and mass.
bobbens Jan 27, 2022
2296204
Initial addition of the large za'lek cores.
bobbens Jan 27, 2022
3bcbc36
Add small bonus and penalty to medium za'lek kernels/drives.
bobbens Jan 27, 2022
c65edc3
Increased grave beam energy usage.
bobbens Jan 27, 2022
f29f936
Got it wrong way around.
bobbens Jan 27, 2022
68e9841
Modify cpu capacity instead of giving cpu cost.
bobbens Jan 27, 2022
1de5418
Renamed things to be a bit mor esensible.
bobbens Jan 27, 2022
330aa50
Add the new cores to Zied.
bobbens Jan 27, 2022
93b0670
Initial commit of Za'lek Arc Cells.
bobbens Jan 27, 2022
1830406
Added za'lek flux cells.
bobbens Jan 27, 2022
e44a8ea
Merge branch 'zlk' of github.com:naev/naev into zlk
bobbens Jan 27, 2022
f2638e8
forgot to rename outfit.
bobbens Jan 27, 2022
c67722b
Added high-tech structures for energy regen and shield.
bobbens Jan 27, 2022
268a208
Nerfed arc cells and buffed flux cells.
bobbens Jan 27, 2022
713ae0c
Merge branch 'main' into zlk
bobbens Jan 27, 2022
731f790
Merge branch 'main' into zlk
bobbens Jan 27, 2022
9e352a2
Merge branch 'main' into zlk
bobbens Feb 1, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions dat/outfits/core_engine/large/zpd_h_2500_drive.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<?xml version='1.0' encoding='UTF-8'?>
<outfit name="ZPD-H-2500 Drive">
<general>
<typename>Core Systems (Engine)</typename>
<slot prop="engines">structure</slot>
<size>large</size>
<mass>30</mass>
<price>2700000</price>
<description>TODO</description>
<gfx_store>engine2.webp</gfx_store>
<priority>3</priority>
</general>
<specific type="modification">
<energy_regen_malus>40</energy_regen_malus>
<engine_limit>2500</engine_limit>
<fuel>1200</fuel>
<speed>120</speed>
<thrust>60</thrust>
<turn>70</turn>
<cpu_max>-100</cpu_max>
</specific>
</outfit>
22 changes: 22 additions & 0 deletions dat/outfits/core_engine/large/zpd_h_4000_drive.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<?xml version='1.0' encoding='UTF-8'?>
<outfit name="ZPD-H-4000 Drive">
<general>
<typename>Core Systems (Engine)</typename>
<slot prop="engines">structure</slot>
<size>large</size>
<priority>7</priority>
<mass>80</mass>
<price>3600000</price>
<description>TODO</description>
<gfx_store>engine5.webp</gfx_store>
</general>
<specific type="modification">
<energy_regen_malus>100</energy_regen_malus>
<engine_limit>4000</engine_limit>
<fuel>1200</fuel>
<speed>85</speed>
<thrust>45</thrust>
<turn>55</turn>
<cpu_max>-200</cpu_max>
</specific>
</outfit>
22 changes: 22 additions & 0 deletions dat/outfits/core_engine/medium/zpd_m_500_drive.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<?xml version='1.0' encoding='UTF-8'?>
<outfit name="ZPD-M-500 Drive">
<general>
<typename>Core Systems (Engine)</typename>
<slot prop="engines">structure</slot>
<size>medium</size>
<mass>10</mass>
<price>360000</price>
<description>TODO</description>
<gfx_store>engine13.webp</gfx_store>
<priority>3</priority>
</general>
<specific type="modification">
<energy_regen_malus>10</energy_regen_malus>
<engine_limit>500</engine_limit>
<fuel>400</fuel>
<speed>240</speed>
<thrust>110</thrust>
<turn>95</turn>
<cpu_max>-25</cpu_max>
</specific>
</outfit>
22 changes: 22 additions & 0 deletions dat/outfits/core_engine/medium/zpd_m_900_drive.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<?xml version='1.0' encoding='UTF-8'?>
<outfit name="ZPD-M-900 Drive">
<general>
<typename>Core Systems (Engine)</typename>
<slot prop="engines">structure</slot>
<size>medium</size>
<mass>15</mass>
<price>675000</price>
<description>TODO</description>
<gfx_store>engine14.webp</gfx_store>
<priority>3</priority>
</general>
<specific type="modification">
<energy_regen_malus>20</energy_regen_malus>
<engine_limit>900</engine_limit>
<fuel>600</fuel>
<speed>160</speed>
<thrust>90</thrust>
<turn>80</turn>
<cpu_max>-50</cpu_max>
</specific>
</outfit>
20 changes: 20 additions & 0 deletions dat/outfits/core_system/large/zck_h_250_kernel.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<?xml version='1.0' encoding='UTF-8'?>
<outfit name="ZCK-H-250 Kernel">
<general>
<typename>Core Systems (System)</typename>
<slot prop="systems">utility</slot>
<size>large</size>
<mass>250</mass>
<price>2000000</price>
<description>TODO</description>
<gfx_store>core_system_cpu_l1.webp</gfx_store>
<priority>3</priority>
</general>
<specific type="modification">
<cpu_max>1500</cpu_max>
<energy>1500</energy>
<energy_regen>90</energy_regen>
<shield>900</shield>
<shield_regen>15</shield_regen>
</specific>
</outfit>
20 changes: 20 additions & 0 deletions dat/outfits/core_system/large/zck_h_600_kernel.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<?xml version='1.0' encoding='UTF-8'?>
<outfit name="ZCK-H-600 Kernel">
<general>
<typename>Core Systems (System)</typename>
<slot prop="systems">utility</slot>
<size>large</size>
<priority>7</priority>
<mass>600</mass>
<price>3600000</price>
<description>TODO</description>
<gfx_store>core_system_cpu_l2.webp</gfx_store>
</general>
<specific type="modification">
<cpu_max>5000</cpu_max>
<energy>2800</energy>
<energy_regen>170</energy_regen>
<shield>1200</shield>
<shield_regen>18</shield_regen>
</specific>
</outfit>
20 changes: 20 additions & 0 deletions dat/outfits/core_system/medium/zck_m_160_kernel.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<?xml version='1.0' encoding='UTF-8'?>
<outfit name="ZCK-M-160 Kernel">
<general>
<typename>Core Systems (System)</typename>
<slot prop="systems">utility</slot>
<size>medium</size>
<mass>150</mass>
<price>400000</price>
<description>TODO</description>
<gfx_store>core_system_cpu_m2.webp</gfx_store>
<priority>3</priority>
</general>
<specific type="modification">
<cpu_max>850</cpu_max>
<energy>800</energy>
<energy_regen>45</energy_regen>
<shield>660</shield>
<shield_regen>12</shield_regen>
</specific>
</outfit>
20 changes: 20 additions & 0 deletions dat/outfits/core_system/medium/zck_m_40_kernel.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<?xml version='1.0' encoding='UTF-8'?>
<outfit name="ZCK-M-40 Kernel">
<general>
<typename>Core Systems (System)</typename>
<slot prop="systems">utility</slot>
<size>medium</size>
<mass>40</mass>
<price>220000</price>
<description>TODO</description>
<gfx_store>core_system_cpu_m1.webp</gfx_store>
<priority>3</priority>
</general>
<specific type="modification">
<cpu_max>625</cpu_max>
<energy>400</energy>
<energy_regen>25</energy_regen>
<shield>500</shield>
<shield_regen>10</shield_regen>
</specific>
</outfit>
8 changes: 4 additions & 4 deletions dat/outfits/fighter_bays/zalek_bomber_drone_bay.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,17 @@
<cond>faction.playerStanding("Za'lek") &gt;= 50</cond>
<condstr>You need at least 50 reputation with House Za'lek.</condstr>
<rarity>2</rarity>
<mass>200</mass>
<mass>120</mass>
<price>950000</price>
<gfx_store>zalek_drone_bomber_fighter_swarm.webp</gfx_store>
<description>This bay can launch two wings of bomber drones capable of bombarding enemy capital ships into submission without the mothership ever coming into danger. It comes with all the devices required for the maintenance and flight of the drones.</description>
<cpu>-500</cpu>
<cpu>-800</cpu>
</general>
<specific type="fighter bay" secondary="1">
<delay>4</delay>
<reload_time>120</reload_time>
<amount>5</amount>
<amount>6</amount>
<ship>Za'lek Bomber Drone</ship>
<ship_mass>25</ship_mass>
<ship_mass>15</ship_mass>
</specific>
</outfit>
8 changes: 4 additions & 4 deletions dat/outfits/fighter_bays/zalek_bomber_drone_mini_bay.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,17 @@
<cond>faction.playerStanding("Za'lek") &gt;= 30</cond>
<condstr>You need at least 30 reputation with House Za'lek.</condstr>
<rarity>2</rarity>
<mass>120</mass>
<mass>40</mass>
<price>1700000</price>
<gfx_store>zalek_drone_bomber_fighter.webp</gfx_store>
<description>This bay can launch a wing of bomber drones capable of bombarding enemy capital ships into submission without the mothership ever coming into danger. It comes with all the devices required for the maintenance and flight of the drones.</description>
<cpu>-135</cpu>
<cpu>-250</cpu>
</general>
<specific type="fighter bay" secondary="1">
<delay>4</delay>
<reload_time>120</reload_time>
<amount>2</amount>
<amount>3</amount>
<ship>Za'lek Bomber Drone</ship>
<ship_mass>25</ship_mass>
<ship_mass>15</ship_mass>
</specific>
</outfit>
8 changes: 4 additions & 4 deletions dat/outfits/fighter_bays/zalek_heavy_drone_bay.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,17 @@
<cond>faction.playerStanding("Za'lek") &gt;= 60</cond>
<condstr>You need at least 60 reputation with House Za'lek.</condstr>
<rarity>2</rarity>
<mass>520</mass>
<mass>120</mass>
<price>2000000</price>
<gfx_store>zalek_drone_heavy_fighter_swarm.webp</gfx_store>
<description>This bay can launch an entire squadron of drones capable of fighting all but the biggest ships in packs. It comes with all the devices required for the maintenance and flight of the drones.</description>
<cpu>-600</cpu>
<cpu>-800</cpu>
</general>
<specific type="fighter bay" secondary="1">
<delay>5</delay>
<reload_time>90</reload_time>
<amount>6</amount>
<amount>5</amount>
<ship>Za'lek Heavy Drone</ship>
<ship_mass>15</ship_mass>
<ship_mass>25</ship_mass>
</specific>
</outfit>
8 changes: 4 additions & 4 deletions dat/outfits/fighter_bays/zalek_heavy_drone_mini_bay.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,17 @@
<cond>faction.playerStanding("Za'lek") &gt;= 40</cond>
<condstr>You need at least 40 reputation with House Za'lek.</condstr>
<rarity>2</rarity>
<mass>160</mass>
<mass>40</mass>
<price>1100000</price>
<gfx_store>zalek_drone_heavy_fighter.webp</gfx_store>
<description>This bay can launch three heavy drones, giving the mothership a good deal of punch. It comes with all the devices required for the maintenance and flight of the drones.</description>
<cpu>-155</cpu>
<cpu>-250</cpu>
</general>
<specific type="fighter bay" secondary="1">
<delay>5</delay>
<reload_time>90</reload_time>
<amount>3</amount>
<amount>2</amount>
<ship>Za'lek Heavy Drone</ship>
<ship_mass>15</ship_mass>
<ship_mass>25</ship_mass>
</specific>
</outfit>
4 changes: 2 additions & 2 deletions dat/outfits/fighter_bays/zalek_light_drone_bay.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
<cond>faction.playerStanding("Za'lek") &gt;= 50</cond>
<condstr>You need at least 50 reputation with House Za'lek.</condstr>
<rarity>2</rarity>
<mass>400</mass>
<mass>120</mass>
<price>1400000</price>
<gfx_store>zalek_drone_light_fighter_swarm.webp</gfx_store>
<description>This bay is built to launch a swarm of Za'lek Light Drones. The drones are expendable, but in numbers they excel at clearing enemy light craft. It comes with all the devices required for the maintenance and flight of the drones.</description>
<cpu>-400</cpu>
<cpu>-800</cpu>
</general>
<specific type="fighter bay" secondary="1">
<delay>2</delay>
Expand Down
4 changes: 2 additions & 2 deletions dat/outfits/fighter_bays/zalek_light_drone_mini_bay.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
<cond>faction.playerStanding("Za'lek") &gt;= 30</cond>
<condstr>You need at least 30 reputation with House Za'lek.</condstr>
<rarity>2</rarity>
<mass>120</mass>
<mass>40</mass>
<price>800000</price>
<gfx_store>zalek_drone_light_fighter.webp</gfx_store>
<description>This bay is built to launch a quartet Za'lek Light Drones. The drones are expendable, but in numbers they excel at clearing enemy light craft. It comes with all the devices required for the maintenance and flight of the drones.</description>
<cpu>-135</cpu>
<cpu>-250</cpu>
</general>
<specific type="fighter bay" secondary="1">
<delay>2</delay>
Expand Down
17 changes: 17 additions & 0 deletions dat/outfits/structure/zlg_h_500_arc_cell.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<?xml version='1.0' encoding='UTF-8'?>
<outfit name="ZLG-H-500 Arc Cell">
<general>
<typename>Power Modifier</typename>
<slot>structure</slot>
<size>large</size>
<mass>50</mass>
<price>330000</price>
<gfx_store>placeholder.webp</gfx_store>
<description>TODO</description>
<priority>3</priority>
<cpu>-500</cpu>
</general>
<specific type="modification">
<energy_regen>28</energy_regen>
</specific>
</outfit>
17 changes: 17 additions & 0 deletions dat/outfits/structure/zlg_m_100_arc_cell.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<?xml version='1.0' encoding='UTF-8'?>
<outfit name="ZLG-M-100 Arc Cell">
<general>
<typename>Power Modifier</typename>
<slot>structure</slot>
<size>medium</size>
<mass>10</mass>
<price>115000</price>
<gfx_store>placeholder.webp</gfx_store>
<description>TODO</description>
<priority>3</priority>
<cpu>-100</cpu>
</general>
<specific type="modification">
<energy_regen>7</energy_regen>
</specific>
</outfit>
17 changes: 17 additions & 0 deletions dat/outfits/structure/zsc_h_500_flux_cell.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<?xml version='1.0' encoding='UTF-8'?>
<outfit name="ZSC-H-500 Flux Cell">
<general>
<typename>Shield Modifier</typename>
<slot>structure</slot>
<size>large</size>
<mass>50</mass>
<price>370000</price>
<description>TODO</description>
<gfx_store>placeholder.webp</gfx_store>
<priority>3</priority>
<cpu>-500</cpu>
</general>
<specific type="modification">
<shield>320</shield>
</specific>
</outfit>
17 changes: 17 additions & 0 deletions dat/outfits/structure/zsc_m_100_flux_cell.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<?xml version='1.0' encoding='UTF-8'?>
<outfit name="ZSC-M-100 Flux Cell">
<general>
<typename>Shield Modifier</typename>
<slot>structure</slot>
<size>medium</size>
<mass>10</mass>
<price>112000</price>
<description>TODO</description>
<gfx_store>placeholder.webp</gfx_store>
<priority>3</priority>
<cpu>-100</cpu>
</general>
<specific type="modification">
<shield>80</shield>
</specific>
</outfit>
6 changes: 3 additions & 3 deletions dat/outfits/weapons/antimatter_lance.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,19 @@
<slot>weapon</slot>
<size>medium</size>
<rarity>4</rarity>
<mass>30</mass>
<mass>20</mass>
<price>1300000</price>
<description>The antimatter lance directly attacks the integrity of a ship on a molecular level. The procedure dissipates large amounts of Birkhoff-Kerr radiation that is able to have significantly adverse effects on the ship being shot at.</description>
<desc_extra>Applies 7 seconds of antimatter taint upon hit, which applies a 10% speed-down to the ship.</desc_extra>
<gfx_store>orion.webp</gfx_store>
<cpu>-60</cpu>
<cpu>-80</cpu>
</general>
<specific type="beam">
<lua>outfits/weapons/antimatter_lance.lua</lua>
<delay>5</delay>
<duration min="3.5">4.5</duration>
<range>600</range>
<energy>40</energy>
<energy>35</energy>
<heatup>50</heatup>
<swivel>22</swivel>
<damage>
Expand Down
Loading