Merge branch 'master' of https://github.com/l0k1/oprf_assets

depot/Dialogs/type.xml

@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+    Copyright (c) 2015 onox
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+-->
+
+<PropertyList>
+
+    <name>type</name>
+    <layout>vbox</layout>
+    <width>250</width>
+    <resizable>false</resizable>
+
+    <group>
+        <layout>hbox</layout>
+
+        <empty><stretch>true</stretch></empty>
+        <text>
+            <label>Type</label>
+        </text>
+        <empty><stretch>true</stretch></empty>
+
+        <button>
+            <legend/>
+            <keynum>27</keynum>
+            <pref-width>16</pref-width>
+            <pref-height>16</pref-height>
+            <border>2</border>
+            <binding>
+                <command>dialog-close</command>
+            </binding>
+        </button>
+    </group>
+
+    <hrule/>
+
+    <group>
+        <layout>vbox</layout>
+        <default-padding>6</default-padding>
+
+        <empty><stretch>true</stretch></empty>
+
+        <button>
+            <legend>Depot</legend>
+            <binding>
+                <command>property-assign</command>
+                <property>sim/multiplay/generic/int[17]</property>
+                <value>0</value>
+            </binding>
+        </button>
+        <button>
+            <legend>Shelter</legend>
+            <binding>
+                <command>property-assign</command>
+                <property>sim/multiplay/generic/int[17]</property>
+                <value>1</value>
+            </binding>
+        </button>
+        <button>
+            <legend>Fuel</legend>
+            <binding>
+                <command>property-assign</command>
+                <property>sim/multiplay/generic/int[17]</property>
+                <value>2</value>
+            </binding>
+        </button>
+        <button>
+            <legend>Small Hangar</legend>
+            <binding>
+                <command>property-assign</command>
+                <property>sim/multiplay/generic/int[17]</property>
+                <value>3</value>
+            </binding>
+        </button>
+        <button>
+            <legend>Hangar</legend>
+            <binding>
+                <command>property-assign</command>
+                <property>sim/multiplay/generic/int[17]</property>
+                <value>4</value>
+            </binding>
+        </button>
+        <button>
+            <legend>Factory</legend>
+            <binding>
+                <command>property-assign</command>
+                <property>sim/multiplay/generic/int[17]</property>
+                <value>5</value>
+            </binding>
+        </button>
+        <button>
+            <legend>Plex</legend>
+            <binding>
+                <command>property-assign</command>
+                <property>sim/multiplay/generic/int[17]</property>
+                <value>6</value>
+            </binding>
+        </button>
+
+
+    </group>
+
+</PropertyList>

depot/Models/40ft_container.ac

@@ -0,0 +1,307 @@
+AC3Db
+MATERIAL "metal_red" rgb 0.705 0.705 0.705  amb 1.000 1.000 1.000  emis 0.000 0.000 0.000  spec 0.598 0.598 0.598  shi 26 trans 0.000
+MATERIAL "metal_green" rgb 0.705 0.705 0.705  amb 1.000 1.000 1.000  emis 0.000 0.000 0.000  spec 0.598 0.598 0.598  shi 26 trans 0.000
+MATERIAL "metal_yellow" rgb 0.705 0.705 0.705  amb 1.000 1.000 1.000  emis 0.000 0.000 0.000  spec 0.598 0.598 0.598  shi 26 trans 0.000
+OBJECT world
+name "Blender_exporter_v2.26__40ft_container.ac"
+kids 5
+OBJECT poly
+name "Cube"
+data 4
+Cube
+crease 40.0
+texture "container_red.png"
+texrep 1 1
+numvert 8
+-2.55457 0 -0.10408
+-2.55457 2.59 -0.10408
+-2.55457 0 -12.30408
+-2.55457 2.59 -12.30408
+-0.12457 0 -0.10408
+-0.12457 2.59 -0.10408
+-0.12457 0 -12.30408
+-0.12457 2.59 -12.30408
+numsurf 6
+SURF 0X0
+mat 0
+refs 4
+0 -2.710623 -0.142225
+1 -2.710623 1.220974
+3 3.710623 1.220974
+2 3.710623 -0.142225
+SURF 0X0
+mat 0
+refs 4
+2 -0.389669 -0.366603
+3 -0.389669 1.529894
+7 1.389669 1.529894
+6 1.389669 -0.366603
+SURF 0X0
+mat 0
+refs 4
+6 3.710623 -0.142225
+7 3.710623 1.220974
+5 -2.710623 1.220974
+4 -2.710623 -0.142225
+SURF 0X0
+mat 0
+refs 4
+4 1.389669 -0.366602
+5 1.389669 1.529895
+1 -0.389669 1.529895
+0 -0.389669 -0.366602
+SURF 0X0
+mat 0
+refs 4
+2 0.454166 0.625461
+6 0.504145 0.625461
+4 0.504145 0.374539
+0 0.454166 0.374539
+SURF 0X0
+mat 0
+refs 4
+7 0.504145 0.625461
+3 0.454166 0.625461
+1 0.454166 0.374539
+5 0.504145 0.374539
+kids 0
+OBJECT poly
+name "Cube.001"
+data 8
+Cube.002
+crease 40.0
+texture "container_green.png"
+texrep 1 1
+numvert 8
+0.12723 0 -0.10408
+0.12723 2.59 -0.10408
+0.12723 0 -12.30408
+0.12723 2.59 -12.30408
+2.55723 0 -0.10408
+2.55723 2.59 -0.10408
+2.55723 0 -12.30408
+2.55723 2.59 -12.30408
+numsurf 6
+SURF 0X0
+mat 1
+refs 4
+0 -2.710623 -0.142225
+1 -2.710623 1.220974
+3 3.710623 1.220974
+2 3.710623 -0.142225
+SURF 0X0
+mat 1
+refs 4
+2 -0.389669 -0.366603
+3 -0.389669 1.529894
+7 1.389669 1.529894
+6 1.389669 -0.366603
+SURF 0X0
+mat 1
+refs 4
+6 3.710623 -0.142225
+7 3.710623 1.220974
+5 -2.710623 1.220974
+4 -2.710623 -0.142225
+SURF 0X0
+mat 1
+refs 4
+4 1.389669 -0.366602
+5 1.389669 1.529895
+1 -0.389669 1.529895
+0 -0.389669 -0.366602
+SURF 0X0
+mat 1
+refs 4
+2 0.454166 0.625461
+6 0.504145 0.625461
+4 0.504145 0.374539
+0 0.454166 0.374539
+SURF 0X0
+mat 1
+refs 4
+7 0.504145 0.625461
+3 0.454166 0.625461
+1 0.454166 0.374539
+5 0.504145 0.374539
+kids 0
+OBJECT poly
+name "Cube.002"
+data 8
+Cube.003
+crease 40.0
+texture "container_yellow.png"
+texrep 1 1
+numvert 8
+0.12723 0 12.28235
+0.12723 2.59 12.28235
+0.12723 0 0.08235
+0.12723 2.59 0.08235
+2.55723 0 12.28235
+2.55723 2.59 12.28235
+2.55723 0 0.08235
+2.55723 2.59 0.08235
+numsurf 6
+SURF 0X0
+mat 2
+refs 4
+0 -2.710623 -0.142225
+1 -2.710623 1.220974
+3 3.710623 1.220974
+2 3.710623 -0.142225
+SURF 0X0
+mat 2
+refs 4
+2 -0.389669 -0.366603
+3 -0.389669 1.529894
+7 1.389669 1.529894
+6 1.389669 -0.366603
+SURF 0X0
+mat 2
+refs 4
+6 3.710623 -0.142225
+7 3.710623 1.220974
+5 -2.710623 1.220974
+4 -2.710623 -0.142225
+SURF 0X0
+mat 2
+refs 4
+4 1.389669 -0.366602
+5 1.389669 1.529895
+1 -0.389669 1.529895
+0 -0.389669 -0.366602
+SURF 0X0
+mat 2
+refs 4
+2 0.454166 0.625461
+6 0.504145 0.625461
+4 0.504145 0.374539
+0 0.454166 0.374539
+SURF 0X0
+mat 2
+refs 4
+7 0.504145 0.625461
+3 0.454166 0.625461
+1 0.454166 0.374539
+5 0.504145 0.374539
+kids 0
+OBJECT poly
+name "Cube.003"
+data 8
+Cube.004
+crease 40.0
+texture "container_green.png"
+texrep 1 1
+numvert 8
+-2.55457 0 12.28235
+-2.55457 2.59 12.28235
+-2.55457 0 0.08235
+-2.55457 2.59 0.08235
+-0.12457 0 12.28235
+-0.12457 2.59 12.28235
+-0.12457 0 0.08235
+-0.12457 2.59 0.08235
+numsurf 6
+SURF 0X0
+mat 1
+refs 4
+0 -2.710623 -0.142225
+1 -2.710623 1.220974
+3 3.710623 1.220974
+2 3.710623 -0.142225
+SURF 0X0
+mat 1
+refs 4
+2 -0.389669 -0.366603
+3 -0.389669 1.529894
+7 1.389669 1.529894
+6 1.389669 -0.366603
+SURF 0X0
+mat 1
+refs 4
+6 3.710623 -0.142225
+7 3.710623 1.220974
+5 -2.710623 1.220974
+4 -2.710623 -0.142225
+SURF 0X0
+mat 1
+refs 4
+4 1.389669 -0.366602
+5 1.389669 1.529895
+1 -0.389669 1.529895
+0 -0.389669 -0.366602
+SURF 0X0
+mat 1
+refs 4
+2 0.454166 0.625461
+6 0.504145 0.625461
+4 0.504145 0.374539
+0 0.454166 0.374539
+SURF 0X0
+mat 1
+refs 4
+7 0.504145 0.625461
+3 0.454166 0.625461
+1 0.454166 0.374539
+5 0.504145 0.374539
+kids 0
+OBJECT poly
+name "Cube.004"
+data 8
+Cube.005
+crease 40.0
+texture "container_red.png"
+texrep 1 1
+numvert 8
+-0.44535 2.59 6.17163
+-0.44535 5.18 6.17163
+-2.06253 2.59 -5.92071
+-2.06253 5.18 -5.92071
+1.9632 2.59 5.84952
+1.9632 5.18 5.84952
+0.34603 2.59 -6.24282
+0.34603 5.18 -6.24282
+numsurf 6
+SURF 0X0
+mat 0
+refs 4
+0 -2.710623 -0.142225
+1 -2.710623 1.220974
+3 3.710623 1.220974
+2 3.710623 -0.142225
+SURF 0X0
+mat 0
+refs 4
+2 -0.389669 -0.366603
+3 -0.389669 1.529894
+7 1.389669 1.529894
+6 1.389669 -0.366603
+SURF 0X0
+mat 0
+refs 4
+6 3.710623 -0.142225
+7 3.710623 1.220974
+5 -2.710623 1.220974
+4 -2.710623 -0.142225
+SURF 0X0
+mat 0
+refs 4
+4 1.389669 -0.366602
+5 1.389669 1.529895
+1 -0.389669 1.529895
+0 -0.389669 -0.366602
+SURF 0X0
+mat 0
+refs 4
+2 0.454166 0.625461
+6 0.504145 0.625461
+4 0.504145 0.374539
+0 0.454166 0.374539
+SURF 0X0
+mat 0
+refs 4
+7 0.504145 0.625461
+3 0.454166 0.625461
+1 0.454166 0.374539
+5 0.504145 0.374539
+kids 0

depot/Models/depot.xml

@@ -106,6 +106,21 @@
 	  	</condition>
 	</animation>
 
+	<model>
+ 		<path>40ft_container.ac</path>
+ 		<name>container</name>
+ 	</model>
+ 	<animation>
+	  	<type>select</type>
+	  	<object-name>container</object-name>
+	  	<condition>
+	      	<equals>
+	        	<property>sim/multiplay/generic/int[17]</property>
+	        	<value>7</value>
+	      	</equals>
+	  	</condition>
+	</animation>
+
 	<model>
 		<path>Aircraft/depot/Models/smoke.xml</path>
 		<offsets>

depot/Nasal/damage.nas

@@ -348,7 +348,7 @@ var fail_systems = func (probability, factor = 100) {#this factor needs tuning a
       hp -= factor * probability*(0.75+rand()*0.25);# from 75 to 100% damage
       printf("HP: %d/%d", hp, hp_max);
       setprop("sam/damage", math.max(0,100*hp/hp_max));#used in HUD
-      if ( hp < 0 ) {
+      if ( hp < 0 and getprop("sim/multiplay/generic/int[17]") != 7) {
         setprop("/carrier/sunk/",1);#we are dead
         setprop("/sim/multiplay/generic/int[2]",1);#radar off
         setprop("/sim/multiplay/generic/int[0]",1);#smoke on

depot/Nasal/fdm.nas

@@ -49,6 +49,7 @@ var PositionUpdater = func () {
 			if (type == 4) {damage.hp_max=900;damage.hp=900;}
 			if (type == 5) {damage.hp_max=1500;damage.hp=1500;}
 			if (type == 6) {damage.hp_max=450;damage.hp=450;}
+			if (type == 7) {damage.hp_max=0;damage.hp=0;}
 			last_type = type;
 		} else {
 			print("Can only switch type when not damaged!!");

depot/depot-set.xml

@@ -110,6 +110,7 @@
             <visibility-range-nm type="int">750</visibility-range-nm>
             <generic>
                 <int n="0" type="int">0</int>
+                <int n="2" type="int">1</int>
                 <int n="17" type="int">0</int>
             </generic>
         </multiplay>

depot/gui/dialogs/type.xml

@@ -109,6 +109,14 @@
                 <value>6</value>
             </binding>
         </button>
+        <button>
+            <legend>Container</legend>
+            <binding>
+                <command>property-assign</command>
+                <property>sim/multiplay/generic/int[17]</property>
+                <value>7</value>
+            </binding>
+        </button>
 
 
     </group>