Skip to content

Commit

Permalink
Natrix overhaul (pioneerspacesim#5963)
Browse files Browse the repository at this point in the history
- Deleted all old model files and textures, except for the .model files
- Adding ship model files and textures. Including shield
- Adding the cockpit model and textures to the Xylophis cockpit dir, since it shares most of the textures with that cockpit.
- Updating the natrix.json ship file with new stats and equipment setup. Will not work with the newest (midsommar) release
  • Loading branch information
bszlrd authored Nov 13, 2024
1 parent cf89d71 commit 065419a
Show file tree
Hide file tree
Showing 27 changed files with 14,687 additions and 896 deletions.
1,661 changes: 1,661 additions & 0 deletions data/models/cockpits/xylophis_cockpit/natrix_cockpit.dae

Large diffs are not rendered by default.

45 changes: 45 additions & 0 deletions data/models/cockpits/xylophis_cockpit/natrix_cockpit.model
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
material Xylophis_cockpit
diffuse 1.0 1.0 1.0
specular 0.7 0.7 0.7
shininess 69
tex_diff xylophis_cockpit_diff.dds
tex_spec xylophis_cockpit_spec.dds
tex_norm xylophis_cockpit_norm.png
tex_glow xylophis_cockpit_glow.dds

material Xylophis_cockpit_transparent
diffuse 1.0 1.0 1.0
specular 0.7 0.7 0.7
shininess 69
opacity 30
tex_diff xylophis_cockpit_diff.dds
tex_spec xylophis_cockpit_spec.dds
tex_norm xylophis_cockpit_norm.png
tex_glow xylophis_cockpit_glow.dds

material Xylophis_cockpit_screen
diffuse 1.0 1.0 1.0
specular 0.7 0.7 0.7
shininess 69
tex_diff xylophis_cockpit_screen_diff.dds
tex_spec xylophis_cockpit_screen_spec.dds
tex_glow xylophis_cockpit_screen_glow.dds

material Natrix-fuselage
diffuse 1.0 1.0 1.0
specular 0.4 0.4 0.4
shininess 40
tex_diff ../../ships/natrix/natrix_diff.dds
tex_spec ../../ships/natrix/natrix_spec.dds
tex_norm ../../ships/natrix/natrix_norm.png
tex_glow ../../ships/natrix/natrix_glow.dds

material Natrix-cockpit
diffuse 1.0 1.0 1.0
specular 0.4 0.4 0.4
shininess 40
tex_diff natrix_cockpit_diff.dds
tex_spec natrix_cockpit_spec.dds
tex_norm natrix_cockpit_norm.png

mesh natrix_cockpit.dae
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file removed data/models/ships/natrix/emit.dds
Binary file not shown.
Binary file removed data/models/ships/natrix/gear_diff.dds
Binary file not shown.
Binary file removed data/models/ships/natrix/hull_diff.dds
Binary file not shown.
Binary file removed data/models/ships/natrix/hull_spec.dds
Binary file not shown.
411 changes: 0 additions & 411 deletions data/models/ships/natrix/natrix.dae

This file was deleted.

50 changes: 35 additions & 15 deletions data/models/ships/natrix/natrix.model
Original file line number Diff line number Diff line change
@@ -1,21 +1,41 @@
material Hull
tex_diff hull_diff.dds
tex_spec hull_spec.dds
tex_glow emit.dds
material Natrix-fuselage
diffuse 1.0 1.0 1.0
specular 1.0 1.0 1.0
use_patterns
specular 0.4 0.4 0.4
shininess 40
tex_diff natrix_diff.dds
tex_spec natrix_spec.dds
tex_norm natrix_norm.png
tex_glow natrix_glow.dds

material Gear
tex_diff gear_diff.dds
diffuse 0.8 0.8 0.8
specular 1.0 1.0 1.0
material Natrix-headlight
diffuse 1.0 1.0 1.0
specular 0.7 0.7 0.7
shininess 60
opacity 60
tex_diff natrix_diff.dds
tex_spec natrix_spec.dds
tex_norm natrix_norm.png
tex_glow natrix_glow.dds

material Natrix-canopy
diffuse 1.0 1.0 1.0
specular 0.7 0.7 0.7
shininess 60
opacity 60
tex_diff natrix_diff.dds
tex_spec natrix_spec.dds
tex_norm natrix_norm.png
tex_glow natrix_glow.dds

lod 300
mesh natrix_1_high.dae

lod 150
mesh natrix_2_mid.dae

lod 100
mesh natrix.dae
lod 50
mesh natrix_3_low.dae

lod 10
mesh natrix_low.dae
collision natrix_4_coll.dae

anim gear_down 1 20
anim gear_down 0 100
5,010 changes: 5,010 additions & 0 deletions data/models/ships/natrix/natrix_1_high.dae

Large diffs are not rendered by default.

3,941 changes: 3,941 additions & 0 deletions data/models/ships/natrix/natrix_2_mid.dae

Large diffs are not rendered by default.

3,634 changes: 3,634 additions & 0 deletions data/models/ships/natrix/natrix_3_low.dae

Large diffs are not rendered by default.

127 changes: 127 additions & 0 deletions data/models/ships/natrix/natrix_4_coll.dae

Large diffs are not rendered by default.

71 changes: 71 additions & 0 deletions data/models/ships/natrix/natrix_5_shield.dae

Large diffs are not rendered by default.

Binary file added data/models/ships/natrix/natrix_diff.dds
Binary file not shown.
Binary file added data/models/ships/natrix/natrix_glow.dds
Binary file not shown.
360 changes: 0 additions & 360 deletions data/models/ships/natrix/natrix_low.dae

This file was deleted.

Binary file added data/models/ships/natrix/natrix_norm.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
76 changes: 0 additions & 76 deletions data/models/ships/natrix/natrix_shield.dae

This file was deleted.

2 changes: 1 addition & 1 deletion data/models/ships/natrix/natrix_shield.model
Original file line number Diff line number Diff line change
@@ -1 +1 @@
mesh natrix_shield.dae
mesh natrix_5_shield.dae
Binary file added data/models/ships/natrix/natrix_spec.dds
Binary file not shown.
Binary file removed data/models/ships/natrix/pattern01.dds
Binary file not shown.
Binary file removed data/models/ships/natrix/pattern02.dds
Binary file not shown.
Binary file removed data/models/ships/natrix/pattern03.dds
Binary file not shown.
195 changes: 162 additions & 33 deletions data/ships/natrix.json
Original file line number Diff line number Diff line change
@@ -1,54 +1,183 @@
{
"model": "natrix",
"name": "Natrix",
"cockpit": "",
"cockpit": "natrix_cockpit",
"shield_model": "natrix_shield",
"manufacturer": "opli",
"ship_class": "medium_freighter",
"min_crew": 1,
"max_crew": 3,
"price": 96181,
"hull_mass": 50,
"ship_class": "heavy_courier",
"min_crew": 2,
"max_crew": 4,
"price": 245883,
"hull_mass": 109,
"structure_mass": 36,
"armor_mass": 58.9,
"volume": 1800,
"atmospheric_pressure_limit": 3.3,
"capacity": 84,
"slots": {
"engine": 1,
"cabin": 25,
"laser_front": 1,
"laser_rear": 1,
"missile": 2,
"cargo": 80
"capacity": 135,
"cargo": 124,

"equipment_slots": {
"cabin_s2_1": {
"type": "cabin",
"size": 2
},
"cabin_s2_2": {
"type": "cabin",
"size": 2
},
"utility_s2_2": {
"type": "utility",
"size": 2,
"size_min": 1,
"tag": "",
"hardpoint": true
},
"utility_s2_3": {
"type": "utility",
"size": 2,
"size_min": 1,
"tag": "",
"hardpoint": true
},
"utility_s3_1": {
"type": "utility",
"size": 3,
"size_min": 2,
"tag": "",
"hardpoint": true
},
"turret_s1_top": {
"type": "turret",
"size": 1,
"i18n_key": "HARDPOINT_TURRET_TOP",
"tag": "",
"hardpoint": true
},
"turret_s1_bottom": {
"type": "turret",
"size": 1,
"i18n_key": "HARDPOINT_TURRET_BOTTOM",
"tag": "",
"hardpoint": true
},
"weapon_s2_1": {
"type": "weapon",
"size": 2,
"size_min": 1,
"i18n_key": "HARDPOINT_WEAPON_FRONT",
"tag": "",
"hardpoint": true,
"gimbal": [5,5]
},
"weapon_s2_2": {
"type": "weapon",
"size": 2,
"size_min": 1,
"i18n_key": "HARDPOINT_WEAPON_FRONT",
"tag": "",
"hardpoint": true,
"gimbal": [5,5]
},
"shield_s3": {
"type": "shield",
"size": 3,
"size_min": 2
},
"missile_bay_s3_left": {
"type": "missile_bay.opli_internal",
"size": 3,
"i18n_key": "HARDPOINT_MISSILE_BAY",
"tag": "",
"hardpoint": true
},
"missile_bay_s3_right": {
"type": "missile_bay.opli_internal",
"size": 3,
"i18n_key": "HARDPOINT_MISSILE_BAY",
"tag": "",
"hardpoint": true
},
"computer_1": {
"type": "computer",
"size": 2,
"size_min": 1
},
"computer_2": {
"type": "computer",
"size": 2,
"size_min": 1
},
"computer_3": {
"type": "computer",
"size": 1,
"size_min": 1
},
"computer_4": {
"type": "computer",
"size": 1,
"size_min": 1
},
"fuel_scoop_s1_left": {
"type": "fuel_scoop",
"size": 1,
"tag": "",
"hardpoint": true
},
"fuel_scoop_s1_right": {
"type": "fuel_scoop",
"size": 1,
"tag": "",
"hardpoint": true
},
"hull_1": {
"type": "hull",
"size": 3
},
"structure_1": {
"type": "structure",
"size": 3
},
"hyperdrive": {
"type": "hyperdrive",
"size": 3,
"size_min": 3
},
"thruster": {
"type": "thruster",
"size": 2,
"count": 12
}
},
"roles": ["mercenary", "merchant", "pirate", "courier"],

"effective_exhaust_velocity": 18000000,
"roles": ["pirate","merchant","mercenary","courier"],
"effective_exhaust_velocity": 14700000,
"thruster_fuel_use": -1.0,
"fuel_tank_mass": 60,
"hyperdrive_class": 2,
"fuel_tank_mass": 200,
"hyperdrive_class": 3,

"forward_thrust": 2700000,
"forward_acceleration_cap": 17.658,
"reverse_thrust": 1300000,
"forward_thrust": 10200000,
"forward_acceleration_cap": 24.525,
"reverse_thrust": 2900000,
"reverse_acceleration_cap": 17.658,
"up_thrust": 850000,
"up_thrust": 6700000,
"up_acceleration_cap": 17.658,
"down_thrust": 850000,
"down_acceleration_cap": 10.0062,
"left_thrust": 850000,
"left_acceleration_cap": 10.0062,
"right_thrust": 850000,
"right_acceleration_cap": 10.0062,
"down_thrust": 2650000,
"down_acceleration_cap": 14.715,
"left_thrust": 1450000,
"left_acceleration_cap": 14.715,
"right_thrust": 1450000,
"right_acceleration_cap": 14.715,

"angular_thrust": 8124820.47813459,
"angular_thrust": 8859987.87,

"front_cross_section": 37,
"side_cross_section": 95,
"top_cross_section": 290,
"front_cross_section": 37.002,
"side_cross_section": 95.002,
"top_cross_section": 290.002,

"front_drag_coeff": 0.45,
"side_drag_coeff": 0.78,
"top_drag_coeff": 0.98,

"lift_coeff": 0.1,
"aero_stability": 0.45
}
}

0 comments on commit 065419a

Please sign in to comment.