diff --git a/A320-main.xml b/A320-main.xml index 074ffa8c..9fd75a46 100644 --- a/A320-main.xml +++ b/A320-main.xml @@ -630,8 +630,9 @@ 0 0 0 - 0 0 + 0 + 0 diff --git a/Models/Instruments/OHpanel/OHpanel.xml b/Models/Instruments/OHpanel/OHpanel.xml index 31cff638..e5d1db41 100644 --- a/Models/Instruments/OHpanel/OHpanel.xml +++ b/Models/Instruments/OHpanel/OHpanel.xml @@ -102,7 +102,6 @@ ELAC2Btn2O EmerCallBtn1C EmerCallBtn2O - EmerElecManOnBtn2O EmerGenInd1F Eng1AntiIceBtn1F Eng1AntiIceBtn2O @@ -152,7 +151,6 @@ LFuelTank2Btn1F LFuelTank2Btn2O IrsOnBatLightOB - MaskManOnBtn2O PassOxyInd1S PrbWinHeatBtn2O PTU1F @@ -204,7 +202,6 @@ CargoHotAirBtn2O EmerCallBtn1C EmerCallBtn2O - EmerElecManOnBtn2O EmerGenInd1F Eng1FireAgt1Btn1S Eng1FireAgt1Btn2D @@ -1690,24 +1687,30 @@ false - - - systems/electrical/battery1-amps - 120 - - - systems/electrical/battery2-amps - 120 - - - systems/electrical/bus/dc1 - 25 - - - systems/electrical/bus/dc2 - 25 - - + + + controls/OH/protectors/ratman + 1 + + + + systems/electrical/battery1-amps + 120 + + + systems/electrical/battery2-amps + 120 + + + systems/electrical/bus/dc1 + 25 + + + systems/electrical/bus/dc2 + 25 + + + property-toggle controls/hydraulic/rat-man @@ -1719,6 +1722,45 @@ + + pick + RATManGuard + + + + property-assign + controls/OH/protectors/ratman + 1 + + + + property-assign + controls/OH/protectors/ratman + 0 + + + nasal + + + + + + + + rotate + RATManGuard + controls/OH/protectors/ratman + -145 + + -0.0086 + -0.05506 + 0.14462 + -0.0086 + -0.04306 + 0.14462 + + + Blue Elec Pump pick pick @@ -6317,54 +6359,6 @@ - - pick - MaskManOnBtn2O - MaskManOnBtn2 - MaskManOnBtn1 - - - false - - - - - systems/electrical/bus/dc1 - 25 - - - systems/electrical/bus/dc2 - 25 - - - - property-toggle - controls/oxygen/masksDeployMan - - - nasal - - - - - - - select - MaskManOnBtn2O - - - - controls/oxygen/masksDeployMan - 1 - - - controls/switches/annun-test - 1 - - - - - pick CrewOxyBtn @@ -6414,7 +6408,42 @@ pick - MaskManOnGaurd + MaskManOnBtn + + + false + + + + + controls/OH/protectors/maskman + 1 + + + + systems/electrical/bus/dc1 + 25 + + + systems/electrical/bus/dc2 + 25 + + + + + property-toggle + controls/oxygen/masksDeployMan + + + nasal + + + + + + + pick + MaskManOnGuard @@ -6438,7 +6467,7 @@ rotate - MaskManOnGaurd + MaskManOnGuard controls/OH/protectors/maskman -145 diff --git a/Models/Instruments/OHpanel/res/background.png b/Models/Instruments/OHpanel/res/background.png index dcde511d..a13c84d4 100644 Binary files a/Models/Instruments/OHpanel/res/background.png and b/Models/Instruments/OHpanel/res/background.png differ diff --git a/Models/Instruments/OHpanel/res/ohpanel.ac b/Models/Instruments/OHpanel/res/ohpanel.ac index aae7e9d0..fa9b99bb 100644 --- a/Models/Instruments/OHpanel/res/ohpanel.ac +++ b/Models/Instruments/OHpanel/res/ohpanel.ac @@ -10,7 +10,1309 @@ MATERIAL "ac3dmat1" rgb 1 1 1 amb 1 1 1 emis 0 0 0 spec 1 1 1 shi 128 trans MATERIAL "DefaultWhite.002" rgb 1 1 1 amb 1 1 1 emis 0 0 0 spec 0.0015 0.0015 0.0015 shi 50 trans 0 MATERIAL "ac3dmat1" rgb 0.501961 0.501961 0.501961 amb 0.501961 0.501961 0.501961 emis 0 0 0 spec 0 0 0 shi 0 trans 0 OBJECT world -kids 343 +kids 340 +OBJECT poly +name "RATManGuard" +loc -0.00734539 0.128418 0.0490607 +texture "redguard.png" +crease 35.000000 +numvert 92 +0.000390999 0.0162016 0.00599997 +0.000390999 -0.0116302 0.00599998 +0.000390999 0.0108016 0.00599997 +0.000391019 -0.0116302 0.0054 +0.00039102 0.0162016 0.00539999 +0.000391006 -0.0116302 0.00857152 +0.000391006 0.0108016 0.00857152 +0.000391039 -0.0105002 0.0104618 +0.000391039 0.01005 0.0104618 +0.00039102 0.0108016 0.00539999 +0.000391015 -0.0116302 -2.6077e-008 +0.000391015 0.0108016 -2.6077e-008 +0.000391015 0.0162016 -2.6077e-008 +0.000391019 -0.0142062 0.0054 +0.000391015 -0.0142062 -2.6077e-008 +0.000391026 0.0162016 -0.00599996 +0.000391026 -0.0116302 -0.00599996 +0.000391026 0.0108016 -0.00599996 +0.000391005 -0.0116302 -0.00539999 +0.000391005 0.0162016 -0.00539999 +0.00039102 -0.0116302 -0.00857153 +0.00039102 0.0108016 -0.00857153 +0.00039099 -0.0105002 -0.0104618 +0.00039099 0.01005 -0.0104618 +0.000391005 0.0108016 -0.00539999 +-0.0030319 -0.0142062 0 +-0.00303191 -0.0142062 -0.00539996 +0.00039102 0.0144466 0.00539999 +0.000391005 -0.0142062 -0.00539999 +-0.0030319 -0.0116302 0 +0.000391009 0.0106649 -0.00920163 +0.000390998 0.0104972 -0.00983173 +0.000390998 -0.0110942 -0.00983173 +0.000391009 -0.0114554 -0.00920163 +0.000391013 0.0106649 0.00920165 +0.000391028 0.0104972 0.00983173 +0.000391028 -0.0110942 0.00983173 +0.000391013 -0.0114554 0.00920165 +3.15397e-005 0.0162016 0.00539999 +3.15229e-005 0.0162016 0.00599997 +3.15229e-005 0.0108016 0.00599997 +3.1522e-005 -0.0116302 0.00599998 +3.15392e-005 -0.0116302 0.0054 +3.15397e-005 0.0108016 0.00539999 +3.15257e-005 0.0108016 0.00857153 +3.15257e-005 -0.0116302 0.00857153 +3.15304e-005 0.0162016 3.72529e-008 +3.15593e-005 0.01005 0.0104618 +3.15593e-005 -0.0105002 0.0104618 +3.15481e-005 0.0104972 0.00983173 +3.1536e-005 -0.0114554 0.00920164 +3.15304e-005 -0.0116302 3.72529e-008 +3.15304e-005 0.0108016 3.72529e-008 +3.15392e-005 -0.0142062 0.0054 +3.15304e-005 -0.0142062 3.72529e-008 +3.15243e-005 0.0162016 -0.00539998 +3.15462e-005 0.0162016 -0.00599997 +3.15462e-005 0.0108016 -0.00599997 +3.15462e-005 -0.0116302 -0.00599997 +3.15243e-005 -0.0116302 -0.00539998 +3.15243e-005 0.0108016 -0.00539998 +3.15397e-005 0.0108016 -0.00857153 +3.15397e-005 -0.0116302 -0.00857153 +0.000390999 0.0144466 0.00599997 +3.16096e-005 0.01005 -0.0104618 +3.16096e-005 -0.0105002 -0.0104618 +3.1522e-005 0.0104972 -0.00983173 +3.15327e-005 -0.0114554 -0.00920166 +-0.00303201 -0.0142062 0.00540007 +-0.00303191 -0.0116302 -0.00539996 +3.15243e-005 -0.0142062 -0.00539998 +-0.00303201 -0.0116302 0.00540007 +3.15327e-005 0.0106649 -0.00920166 +3.1522e-005 -0.0110942 -0.00983173 +3.1536e-005 0.0106649 0.00920164 +3.15481e-005 -0.0110942 0.00983173 +0.000391015 0.0144466 -2.6077e-008 +0.000391026 0.0144466 -0.00599996 +0.000391005 0.0144466 -0.00539999 +3.15229e-005 0.0144466 0.00599997 +3.15397e-005 0.0144466 0.00539999 +3.15304e-005 0.0144466 3.72529e-008 +3.15462e-005 0.0144466 -0.00599997 +3.15243e-005 0.0144466 -0.00539998 +-0.00253932 0.0162016 0.00539999 +-0.00253934 0.0162016 0.00599995 +-0.00253932 0.0144466 0.00539999 +-0.00253933 0.0162016 -0.00540002 +-0.00253931 0.0162016 -0.006 +-0.00253933 0.0144466 -0.00540002 +-0.00253934 0.0144466 0.00599995 +-0.00253931 0.0144466 -0.006 +numsurf 90 +SURF 0x0 +mat 9 +refs 4 +2 0.176482 0.809302 +1 0.176482 0.303805 +3 0.190002 0.303805 +9 0.190002 0.809302 +SURF 0x0 +mat 9 +refs 4 +63 0.176482 0.891441 +2 0.176482 0.809302 +9 0.190002 0.809302 +27 0.190002 0.891441 +SURF 0x0 +mat 9 +refs 4 +36 0.090134 0.315882 +35 0.090134 0.802443 +8 0.075935 0.792365 +7 0.075935 0.329269 +SURF 0x0 +mat 9 +refs 4 +1 0.176482 0.303805 +2 0.176482 0.809302 +6 0.118532 0.809302 +5 0.118532 0.303805 +SURF 0x0 +mat 9 +refs 4 +27 0.190002 0.891441 +9 0.190002 0.809302 +11 0.311691 0.809302 +76 0.311691 0.891441 +SURF 0x0 +mat 9 +refs 4 +9 0.190002 0.809302 +3 0.190002 0.303805 +10 0.311691 0.303805 +11 0.311691 0.809302 +SURF 0x0 +mat 9 +refs 4 +10 0.311691 0.303805 +3 0.190002 0.303805 +13 0.190002 0.245755 +14 0.311691 0.245755 +SURF 0x0 +mat 9 +refs 4 +17 0.4469 0.809302 +24 0.433379 0.809302 +18 0.433379 0.303805 +16 0.4469 0.303805 +SURF 0x0 +mat 9 +refs 4 +77 0.4469 0.891441 +78 0.433379 0.891441 +24 0.433379 0.809302 +17 0.4469 0.809302 +SURF 0x0 +mat 9 +refs 4 +32 0.533248 0.315882 +22 0.547447 0.329269 +23 0.547447 0.792365 +31 0.533248 0.802443 +SURF 0x0 +mat 9 +refs 4 +16 0.4469 0.303805 +20 0.504849 0.303805 +21 0.504849 0.809302 +17 0.4469 0.809302 +SURF 0x0 +mat 9 +refs 4 +19 0.433379 0.93099 +55 0.433379 0.93099 +46 0.311691 0.93099 +12 0.311691 0.93099 +SURF 0x0 +mat 9 +refs 4 +17 0.4469 0.809302 +57 0.4469 0.809302 +82 0.4469 0.891441 +77 0.4469 0.891441 +SURF 0x0 +mat 9 +refs 4 +55 0.433379 0.93099 +83 0.433379 0.891441 +81 0.311691 0.891441 +46 0.311691 0.93099 +SURF 0x0 +mat 9 +refs 4 +20 0.504849 0.303805 +33 0.519049 0.307744 +30 0.519049 0.806222 +21 0.504849 0.809302 +SURF 0x0 +mat 9 +refs 4 +33 0.519049 0.307744 +32 0.533248 0.315882 +31 0.533248 0.802443 +30 0.519049 0.806222 +SURF 0x0 +mat 9 +refs 4 +5 0.118532 0.303805 +6 0.118532 0.809302 +34 0.104333 0.806222 +37 0.104333 0.307744 +SURF 0x0 +mat 9 +refs 4 +37 0.104333 0.307744 +34 0.104333 0.806222 +35 0.090134 0.802443 +36 0.090134 0.315882 +SURF 0x0 +mat 9 +refs 4 +40 0.176482 0.809302 +43 0.190002 0.809302 +42 0.190002 0.303805 +41 0.176482 0.303805 +SURF 0x0 +mat 9 +refs 4 +79 0.176482 0.891441 +80 0.190002 0.891441 +43 0.190002 0.809302 +40 0.176482 0.809302 +SURF 0x0 +mat 9 +refs 4 +75 0.090134 0.315882 +48 0.075935 0.329269 +47 0.075935 0.792365 +49 0.090134 0.802443 +SURF 0x0 +mat 9 +refs 4 +41 0.176482 0.303805 +45 0.118532 0.303805 +44 0.118532 0.809302 +40 0.176482 0.809302 +SURF 0x0 +mat 9 +refs 4 +80 0.190002 0.891441 +81 0.311691 0.891441 +52 0.311691 0.809302 +43 0.190002 0.809302 +SURF 0x0 +mat 9 +refs 4 +43 0.190002 0.809302 +52 0.311691 0.809302 +51 0.311691 0.303805 +42 0.190002 0.303805 +SURF 0x0 +mat 9 +refs 4 +70 0.433379 0.245755 +26 0.433379 0.245755 +69 0.433379 0.303805 +59 0.433379 0.303805 +SURF 0x0 +mat 9 +refs 4 +57 0.4469 0.809302 +58 0.4469 0.303805 +59 0.433379 0.303805 +60 0.433379 0.809302 +SURF 0x0 +mat 9 +refs 4 +82 0.4469 0.891441 +57 0.4469 0.809302 +60 0.433379 0.809302 +83 0.433379 0.891441 +SURF 0x0 +mat 9 +refs 4 +73 0.533248 0.315882 +66 0.533248 0.802443 +64 0.547447 0.792365 +65 0.547447 0.329269 +SURF 0x0 +mat 9 +refs 4 +58 0.4469 0.303805 +57 0.4469 0.809302 +61 0.504849 0.809302 +62 0.504849 0.303805 +SURF 0x0 +mat 9 +refs 4 +24 0.433379 0.809302 +11 0.311691 0.809302 +10 0.311691 0.303805 +18 0.433379 0.303805 +SURF 0x0 +mat 9 +refs 4 +0 0.176482 0.93099 +39 0.176482 0.93099 +79 0.176482 0.891441 +63 0.176482 0.891441 +SURF 0x0 +mat 9 +refs 4 +10 0.311691 0.303805 +14 0.311691 0.245755 +28 0.433379 0.245755 +18 0.433379 0.303805 +SURF 0x0 +mat 9 +refs 4 +62 0.504849 0.303805 +61 0.504849 0.809302 +72 0.519049 0.806222 +67 0.519049 0.307744 +SURF 0x0 +mat 9 +refs 4 +67 0.519049 0.307744 +72 0.519049 0.806222 +66 0.533248 0.802443 +73 0.533248 0.315882 +SURF 0x0 +mat 9 +refs 4 +45 0.118532 0.303805 +50 0.104333 0.307744 +74 0.104333 0.806222 +44 0.118532 0.809302 +SURF 0x0 +mat 9 +refs 4 +50 0.104333 0.307744 +75 0.090134 0.315882 +49 0.090134 0.802443 +74 0.104333 0.806222 +SURF 0x0 +mat 9 +refs 4 +3 0.190002 0.303805 +42 0.190002 0.303805 +53 0.190002 0.245755 +13 0.190002 0.245755 +SURF 0x0 +mat 9 +refs 4 +21 0.504849 0.809302 +61 0.504849 0.809302 +57 0.4469 0.809302 +17 0.4469 0.809302 +SURF 0x0 +mat 9 +refs 4 +54 0.311691 0.245755 +25 0.311691 0.245755 +26 0.433379 0.245755 +70 0.433379 0.245755 +SURF 0x0 +mat 9 +refs 4 +1 0.176482 0.303805 +41 0.176482 0.303805 +42 0.190002 0.303805 +3 0.190002 0.303805 +SURF 0x0 +mat 9 +refs 4 +16 0.4469 0.303805 +58 0.4469 0.303805 +62 0.504849 0.303805 +20 0.504849 0.303805 +SURF 0x0 +mat 9 +refs 4 +15 0.4469 0.93099 +56 0.4469 0.93099 +55 0.433379 0.93099 +19 0.433379 0.93099 +SURF 0x0 +mat 9 +refs 4 +6 0.118532 0.809302 +44 0.118532 0.809302 +74 0.104333 0.806222 +34 0.104333 0.806222 +SURF 0x0 +mat 9 +refs 4 +12 0.311691 0.93099 +46 0.311691 0.93099 +38 0.190002 0.93099 +4 0.190002 0.93099 +SURF 0x0 +mat 9 +refs 4 +34 0.104333 0.806222 +74 0.104333 0.806222 +49 0.090134 0.802443 +35 0.090134 0.802443 +SURF 0x0 +mat 9 +refs 4 +8 0.075935 0.792365 +47 0.075935 0.792365 +48 0.075935 0.329269 +7 0.075935 0.329269 +SURF 0x0 +mat 9 +refs 4 +77 0.4469 0.891441 +82 0.4469 0.891441 +56 0.4469 0.93099 +15 0.4469 0.93099 +SURF 0x0 +mat 9 +refs 4 +7 0.075935 0.329269 +48 0.075935 0.329269 +75 0.090134 0.315882 +36 0.090134 0.315882 +SURF 0x0 +mat 9 +refs 4 +35 0.090134 0.802443 +49 0.090134 0.802443 +47 0.075935 0.792365 +8 0.075935 0.792365 +SURF 0x0 +mat 9 +refs 4 +83 0.433379 0.891441 +60 0.433379 0.809302 +52 0.311691 0.809302 +81 0.311691 0.891441 +SURF 0x0 +mat 9 +refs 4 +36 0.090134 0.315882 +75 0.090134 0.315882 +50 0.104333 0.307744 +37 0.104333 0.307744 +SURF 0x0 +mat 9 +refs 4 +37 0.104333 0.307744 +50 0.104333 0.307744 +45 0.118532 0.303805 +5 0.118532 0.303805 +SURF 0x0 +mat 9 +refs 4 +59 0.433379 0.303805 +69 0.433379 0.303805 +29 0.311691 0.303805 +51 0.311691 0.303805 +SURF 0x0 +mat 9 +refs 4 +2 0.176482 0.809302 +40 0.176482 0.809302 +44 0.118532 0.809302 +6 0.118532 0.809302 +SURF 0x0 +mat 9 +refs 4 +19 0.433379 0.93099 +12 0.311691 0.93099 +76 0.311691 0.891441 +78 0.433379 0.891441 +SURF 0x0 +mat 9 +refs 4 +5 0.118532 0.303805 +45 0.118532 0.303805 +41 0.176482 0.303805 +1 0.176482 0.303805 +SURF 0x0 +mat 9 +refs 4 +28 0.433379 0.245755 +70 0.433379 0.245755 +59 0.433379 0.303805 +18 0.433379 0.303805 +SURF 0x0 +mat 9 +refs 4 +4 0.190002 0.93099 +38 0.190002 0.93099 +39 0.176482 0.93099 +0 0.176482 0.93099 +SURF 0x0 +mat 9 +refs 4 +53 0.190002 0.245755 +68 0.190002 0.245755 +25 0.311691 0.245755 +54 0.311691 0.245755 +SURF 0x0 +mat 9 +refs 4 +18 0.433379 0.303805 +59 0.433379 0.303805 +58 0.4469 0.303805 +16 0.4469 0.303805 +SURF 0x0 +mat 9 +refs 4 +30 0.519049 0.806222 +72 0.519049 0.806222 +61 0.504849 0.809302 +21 0.504849 0.809302 +SURF 0x0 +mat 9 +refs 4 +63 0.176482 0.891441 +79 0.176482 0.891441 +40 0.176482 0.809302 +2 0.176482 0.809302 +SURF 0x0 +mat 9 +refs 4 +42 0.190002 0.303805 +71 0.190002 0.303805 +68 0.190002 0.245755 +53 0.190002 0.245755 +SURF 0x0 +mat 9 +refs 4 +29 0.311691 0.303805 +69 0.433379 0.303805 +26 0.433379 0.245755 +25 0.311691 0.245755 +SURF 0x0 +mat 9 +refs 4 +31 0.533248 0.802443 +66 0.533248 0.802443 +72 0.519049 0.806222 +30 0.519049 0.806222 +SURF 0x0 +mat 9 +refs 4 +22 0.547447 0.329269 +65 0.547447 0.329269 +64 0.547447 0.792365 +23 0.547447 0.792365 +SURF 0x0 +mat 9 +refs 4 +29 0.311691 0.303805 +25 0.311691 0.245755 +68 0.190002 0.245755 +71 0.190002 0.303805 +SURF 0x0 +mat 9 +refs 4 +32 0.533248 0.315882 +73 0.533248 0.315882 +65 0.547447 0.329269 +22 0.547447 0.329269 +SURF 0x0 +mat 9 +refs 4 +23 0.547447 0.792365 +64 0.547447 0.792365 +66 0.533248 0.802443 +31 0.533248 0.802443 +SURF 0x0 +mat 9 +refs 4 +13 0.190002 0.245755 +53 0.190002 0.245755 +54 0.311691 0.245755 +14 0.311691 0.245755 +SURF 0x0 +mat 9 +refs 4 +33 0.519049 0.307744 +67 0.519049 0.307744 +73 0.533248 0.315882 +32 0.533248 0.315882 +SURF 0x0 +mat 9 +refs 4 +20 0.504849 0.303805 +62 0.504849 0.303805 +67 0.519049 0.307744 +33 0.519049 0.307744 +SURF 0x0 +mat 9 +refs 4 +60 0.433379 0.809302 +59 0.433379 0.303805 +51 0.311691 0.303805 +52 0.311691 0.809302 +SURF 0x0 +mat 9 +refs 4 +14 0.311691 0.245755 +54 0.311691 0.245755 +70 0.433379 0.245755 +28 0.433379 0.245755 +SURF 0x0 +mat 9 +refs 4 +51 0.311691 0.303805 +29 0.311691 0.303805 +71 0.190002 0.303805 +42 0.190002 0.303805 +SURF 0x0 +mat 9 +refs 4 +78 0.433379 0.891441 +76 0.311691 0.891441 +11 0.311691 0.809302 +24 0.433379 0.809302 +SURF 0x0 +mat 9 +refs 4 +39 0.176482 0.93099 +85 0.176482 0.93099 +90 0.176482 0.891441 +79 0.176482 0.891441 +SURF 0x0 +mat 9 +refs 4 +38 0.190002 0.93099 +46 0.311691 0.93099 +81 0.311691 0.891441 +80 0.190002 0.891441 +SURF 0x0 +mat 9 +refs 4 +79 0.176482 0.891441 +90 0.176482 0.891441 +86 0.190002 0.891441 +80 0.190002 0.891441 +SURF 0x0 +mat 9 +refs 4 +15 0.4469 0.93099 +19 0.433379 0.93099 +78 0.433379 0.891441 +77 0.4469 0.891441 +SURF 0x0 +mat 9 +refs 4 +4 0.190002 0.93099 +27 0.190002 0.891441 +76 0.311691 0.891441 +12 0.311691 0.93099 +SURF 0x0 +mat 9 +refs 4 +0 0.176482 0.93099 +63 0.176482 0.891441 +27 0.190002 0.891441 +4 0.190002 0.93099 +SURF 0x0 +mat 9 +refs 4 +88 0.4469 0.93099 +91 0.4469 0.891441 +89 0.433379 0.891441 +87 0.433379 0.93099 +SURF 0x0 +mat 9 +refs 4 +85 0.176482 0.93099 +84 0.190002 0.93099 +86 0.190002 0.891441 +90 0.176482 0.891441 +SURF 0x0 +mat 9 +refs 4 +83 0.433379 0.891441 +89 0.433379 0.891441 +91 0.4469 0.891441 +82 0.4469 0.891441 +SURF 0x0 +mat 9 +refs 4 +55 0.433379 0.93099 +87 0.433379 0.93099 +89 0.433379 0.891441 +83 0.433379 0.891441 +SURF 0x0 +mat 9 +refs 4 +82 0.4469 0.891441 +91 0.4469 0.891441 +88 0.4469 0.93099 +56 0.4469 0.93099 +SURF 0x0 +mat 9 +refs 4 +56 0.4469 0.93099 +88 0.4469 0.93099 +87 0.433379 0.93099 +55 0.433379 0.93099 +SURF 0x0 +mat 9 +refs 4 +80 0.190002 0.891441 +86 0.190002 0.891441 +84 0.190002 0.93099 +38 0.190002 0.93099 +SURF 0x0 +mat 9 +refs 4 +38 0.190002 0.93099 +84 0.190002 0.93099 +85 0.176482 0.93099 +39 0.176482 0.93099 +kids 0 +OBJECT poly +name "MaskManOnBtn" +loc 0.00428162 -0.0472421 0.0342781 +data 12 +Cylinder.018 +crease 30.000000 +numvert 37 +0.000333 -0.132317 0.229804 +0.000562001 -0.133384 0.231639 +0.000827001 -0.133384 0.233758 +0.001056 -0.132317 0.235592 +0.001189 -0.130468 0.236652 +0.001189 -0.128332 0.236652 +0.001056 -0.126483 0.235592 +0.000827001 -0.125416 0.233758 +0.000562001 -0.125416 0.231639 +0.000333 -0.126483 0.229804 +0.000200002 -0.128332 0.228745 +0.000200002 -0.130468 0.228745 +0.000695001 -0.1294 0.232698 +-0.001784 -0.130468 0.228993 +-0.001784 -0.128332 0.228993 +-0.001652 -0.126483 0.230052 +-0.001422 -0.125416 0.231887 +-0.001158 -0.125416 0.234006 +-0.000927999 -0.126483 0.235841 +-0.000795999 -0.128332 0.2369 +-0.000795999 -0.130468 0.2369 +-0.000927999 -0.132317 0.235841 +-0.001158 -0.133384 0.234006 +-0.001422 -0.133384 0.231887 +-0.001652 -0.132317 0.230052 +-0.001948 -0.134703 0.227684 +-0.001531 -0.136644 0.23102 +-0.001049 -0.136644 0.234872 +-0.000631998 -0.134703 0.238209 +-0.000390998 -0.131341 0.240135 +-0.000390998 -0.127459 0.240135 +-0.000631998 -0.124097 0.238209 +-0.001049 -0.122156 0.234872 +-0.001531 -0.122156 0.23102 +-0.001948 -0.124097 0.227684 +-0.002189 -0.127459 0.225758 +-0.002189 -0.131341 0.225758 +numsurf 36 +SURF 0x20 +mat 2 +refs 3 +1 0 0 +0 0 0 +12 0 0 +SURF 0x20 +mat 2 +refs 3 +1 0 0 +12 0 0 +2 0 0 +SURF 0x20 +mat 2 +refs 3 +2 0 0 +12 0 0 +3 0 0 +SURF 0x20 +mat 2 +refs 3 +3 0 0 +12 0 0 +4 0 0 +SURF 0x20 +mat 2 +refs 3 +4 0 0 +12 0 0 +5 0 0 +SURF 0x20 +mat 2 +refs 3 +5 0 0 +12 0 0 +6 0 0 +SURF 0x20 +mat 2 +refs 3 +6 0 0 +12 0 0 +7 0 0 +SURF 0x20 +mat 2 +refs 3 +7 0 0 +12 0 0 +8 0 0 +SURF 0x20 +mat 2 +refs 3 +8 0 0 +12 0 0 +9 0 0 +SURF 0x20 +mat 2 +refs 3 +9 0 0 +12 0 0 +10 0 0 +SURF 0x20 +mat 2 +refs 3 +10 0 0 +12 0 0 +11 0 0 +SURF 0x20 +mat 2 +refs 3 +11 0 0 +12 0 0 +0 0 0 +SURF 0x20 +mat 2 +refs 4 +24 0 0 +0 0 0 +1 0 0 +23 0 0 +SURF 0x20 +mat 2 +refs 4 +23 0 0 +1 0 0 +2 0 0 +22 0 0 +SURF 0x20 +mat 2 +refs 4 +22 0 0 +2 0 0 +3 0 0 +21 0 0 +SURF 0x20 +mat 2 +refs 4 +21 0 0 +3 0 0 +4 0 0 +20 0 0 +SURF 0x20 +mat 2 +refs 4 +20 0 0 +4 0 0 +5 0 0 +19 0 0 +SURF 0x20 +mat 2 +refs 4 +19 0 0 +5 0 0 +6 0 0 +18 0 0 +SURF 0x20 +mat 2 +refs 4 +18 0 0 +6 0 0 +7 0 0 +17 0 0 +SURF 0x20 +mat 2 +refs 4 +17 0 0 +7 0 0 +8 0 0 +16 0 0 +SURF 0x20 +mat 2 +refs 4 +16 0 0 +8 0 0 +9 0 0 +15 0 0 +SURF 0x20 +mat 2 +refs 4 +15 0 0 +9 0 0 +10 0 0 +14 0 0 +SURF 0x20 +mat 2 +refs 4 +14 0 0 +10 0 0 +11 0 0 +13 0 0 +SURF 0x20 +mat 2 +refs 4 +13 0 0 +11 0 0 +0 0 0 +24 0 0 +SURF 0x20 +mat 2 +refs 4 +36 0 0 +13 0 0 +24 0 0 +25 0 0 +SURF 0x20 +mat 2 +refs 4 +13 0 0 +36 0 0 +35 0 0 +14 0 0 +SURF 0x20 +mat 2 +refs 4 +34 0 0 +15 0 0 +14 0 0 +35 0 0 +SURF 0x20 +mat 2 +refs 4 +33 0 0 +16 0 0 +15 0 0 +34 0 0 +SURF 0x20 +mat 2 +refs 4 +32 0 0 +17 0 0 +16 0 0 +33 0 0 +SURF 0x20 +mat 2 +refs 4 +31 0 0 +18 0 0 +17 0 0 +32 0 0 +SURF 0x20 +mat 2 +refs 4 +30 0 0 +19 0 0 +18 0 0 +31 0 0 +SURF 0x20 +mat 2 +refs 4 +29 0 0 +20 0 0 +19 0 0 +30 0 0 +SURF 0x20 +mat 2 +refs 4 +28 0 0 +21 0 0 +20 0 0 +29 0 0 +SURF 0x20 +mat 2 +refs 4 +27 0 0 +22 0 0 +21 0 0 +28 0 0 +SURF 0x20 +mat 2 +refs 4 +26 0 0 +23 0 0 +22 0 0 +27 0 0 +SURF 0x20 +mat 2 +refs 4 +25 0 0 +24 0 0 +23 0 0 +26 0 0 +kids 0 +OBJECT poly +name "EmerElecManOnBtn" +loc -0.00356943 0.0835944 -0.0305534 +data 12 +Cylinder.018 +crease 30.000000 +numvert 37 +0.000333 -0.132317 0.229804 +0.000562001 -0.133384 0.231639 +0.000827001 -0.133384 0.233758 +0.001056 -0.132317 0.235592 +0.001189 -0.130468 0.236652 +0.001189 -0.128332 0.236652 +0.001056 -0.126483 0.235592 +0.000827001 -0.125416 0.233758 +0.000562001 -0.125416 0.231639 +0.000333 -0.126483 0.229804 +0.000200002 -0.128332 0.228745 +0.000200002 -0.130468 0.228745 +0.000695001 -0.1294 0.232698 +-0.001784 -0.130468 0.228993 +-0.001784 -0.128332 0.228993 +-0.001652 -0.126483 0.230052 +-0.001422 -0.125416 0.231887 +-0.001158 -0.125416 0.234006 +-0.000927999 -0.126483 0.235841 +-0.000795999 -0.128332 0.2369 +-0.000795999 -0.130468 0.2369 +-0.000927999 -0.132317 0.235841 +-0.001158 -0.133384 0.234006 +-0.001422 -0.133384 0.231887 +-0.001652 -0.132317 0.230052 +-0.001948 -0.134703 0.227684 +-0.001531 -0.136644 0.23102 +-0.001049 -0.136644 0.234872 +-0.000631998 -0.134703 0.238209 +-0.000390998 -0.131341 0.240135 +-0.000390998 -0.127459 0.240135 +-0.000631998 -0.124097 0.238209 +-0.001049 -0.122156 0.234872 +-0.001531 -0.122156 0.23102 +-0.001948 -0.124097 0.227684 +-0.002189 -0.127459 0.225758 +-0.002189 -0.131341 0.225758 +numsurf 36 +SURF 0x20 +mat 2 +refs 3 +1 0 0 +0 0 0 +12 0 0 +SURF 0x20 +mat 2 +refs 3 +1 0 0 +12 0 0 +2 0 0 +SURF 0x20 +mat 2 +refs 3 +2 0 0 +12 0 0 +3 0 0 +SURF 0x20 +mat 2 +refs 3 +3 0 0 +12 0 0 +4 0 0 +SURF 0x20 +mat 2 +refs 3 +4 0 0 +12 0 0 +5 0 0 +SURF 0x20 +mat 2 +refs 3 +5 0 0 +12 0 0 +6 0 0 +SURF 0x20 +mat 2 +refs 3 +6 0 0 +12 0 0 +7 0 0 +SURF 0x20 +mat 2 +refs 3 +7 0 0 +12 0 0 +8 0 0 +SURF 0x20 +mat 2 +refs 3 +8 0 0 +12 0 0 +9 0 0 +SURF 0x20 +mat 2 +refs 3 +9 0 0 +12 0 0 +10 0 0 +SURF 0x20 +mat 2 +refs 3 +10 0 0 +12 0 0 +11 0 0 +SURF 0x20 +mat 2 +refs 3 +11 0 0 +12 0 0 +0 0 0 +SURF 0x20 +mat 2 +refs 4 +24 0 0 +0 0 0 +1 0 0 +23 0 0 +SURF 0x20 +mat 2 +refs 4 +23 0 0 +1 0 0 +2 0 0 +22 0 0 +SURF 0x20 +mat 2 +refs 4 +22 0 0 +2 0 0 +3 0 0 +21 0 0 +SURF 0x20 +mat 2 +refs 4 +21 0 0 +3 0 0 +4 0 0 +20 0 0 +SURF 0x20 +mat 2 +refs 4 +20 0 0 +4 0 0 +5 0 0 +19 0 0 +SURF 0x20 +mat 2 +refs 4 +19 0 0 +5 0 0 +6 0 0 +18 0 0 +SURF 0x20 +mat 2 +refs 4 +18 0 0 +6 0 0 +7 0 0 +17 0 0 +SURF 0x20 +mat 2 +refs 4 +17 0 0 +7 0 0 +8 0 0 +16 0 0 +SURF 0x20 +mat 2 +refs 4 +16 0 0 +8 0 0 +9 0 0 +15 0 0 +SURF 0x20 +mat 2 +refs 4 +15 0 0 +9 0 0 +10 0 0 +14 0 0 +SURF 0x20 +mat 2 +refs 4 +14 0 0 +10 0 0 +11 0 0 +13 0 0 +SURF 0x20 +mat 2 +refs 4 +13 0 0 +11 0 0 +0 0 0 +24 0 0 +SURF 0x20 +mat 2 +refs 4 +36 0 0 +13 0 0 +24 0 0 +25 0 0 +SURF 0x20 +mat 2 +refs 4 +13 0 0 +36 0 0 +35 0 0 +14 0 0 +SURF 0x20 +mat 2 +refs 4 +34 0 0 +15 0 0 +14 0 0 +35 0 0 +SURF 0x20 +mat 2 +refs 4 +33 0 0 +16 0 0 +15 0 0 +34 0 0 +SURF 0x20 +mat 2 +refs 4 +32 0 0 +17 0 0 +16 0 0 +33 0 0 +SURF 0x20 +mat 2 +refs 4 +31 0 0 +18 0 0 +17 0 0 +32 0 0 +SURF 0x20 +mat 2 +refs 4 +30 0 0 +19 0 0 +18 0 0 +31 0 0 +SURF 0x20 +mat 2 +refs 4 +29 0 0 +20 0 0 +19 0 0 +30 0 0 +SURF 0x20 +mat 2 +refs 4 +28 0 0 +21 0 0 +20 0 0 +29 0 0 +SURF 0x20 +mat 2 +refs 4 +27 0 0 +22 0 0 +21 0 0 +28 0 0 +SURF 0x20 +mat 2 +refs 4 +26 0 0 +23 0 0 +22 0 0 +27 0 0 +SURF 0x20 +mat 2 +refs 4 +25 0 0 +24 0 0 +23 0 0 +26 0 0 +kids 0 OBJECT poly name "EmerExtLtBtn2O" loc 0.000175806 -0.267309 -0.0619467 @@ -19193,7 +20495,7 @@ refs 4 7 0.5 1 kids 0 OBJECT poly -name "EmerManOnGaurd" +name "EmerManOnGuard" loc -0.00221982 -0.0441595 0.202375 texture "redguard.png" crease 35.000000 @@ -19923,145 +21225,7 @@ refs 4 39 0.176482 0.93099 kids 0 OBJECT poly -name "EmerElecManOnBtn1" -loc 0.000550692 0.0460082 0.00300418 -data 8 -Cube.123 -texture "buttons.png" -crease 30.000000 -numvert 8 --0.003932 -0.0804 0.189236 --0.001451 -0.0804 0.209082 --0.004428 -0.0804 0.209454 --0.006909 -0.0804 0.189608 --0.003932 -0.0904 0.189236 --0.001451 -0.0904 0.209082 --0.004428 -0.0904 0.209454 --0.006909 -0.0904 0.189608 -numsurf 4 -SURF 0x0 -mat 4 -refs 4 -0 0.5 0.5 -3 0.5 0.5 -2 9.31321e-008 0.5 -1 9.31321e-008 0.5 -SURF 0x0 -mat 4 -refs 4 -4 0.5 0.25 -0 0.5 0.5 -1 9.31321e-008 0.5 -5 0 0.25 -SURF 0x0 -mat 4 -refs 4 -5 0 0.25 -1 9.31321e-008 0.5 -2 9.31321e-008 0.5 -6 0 0.25 -SURF 0x0 -mat 4 -refs 4 -7 0.5 0.25 -3 0.5 0.5 -0 0.5 0.5 -4 0.5 0.25 -kids 0 -OBJECT poly -name "EmerElecManOnBtn2" -loc 0.000550692 0.0460082 0.00300418 -data 8 -Cube.124 -texture "buttons.png" -crease 30.000000 -numvert 8 --0.006909 -0.0904 0.189608 --0.004428 -0.0904 0.209454 --0.001451 -0.0904 0.209082 --0.003932 -0.0904 0.189236 --0.006909 -0.1004 0.189608 --0.004428 -0.1004 0.209454 --0.001451 -0.1004 0.209082 --0.003932 -0.1004 0.189236 -numsurf 4 -SURF 0x0 -mat 4 -refs 4 -3 0.5 0.25 -7 0.5 0 -4 0.5 0 -0 0.5 0.25 -SURF 0x0 -mat 4 -refs 4 -6 0 1.19209e-007 -2 9.31321e-008 0.25 -1 9.31321e-008 0.25 -5 0 1.19209e-007 -SURF 0x0 -mat 4 -refs 4 -7 0.5 0 -3 0.5 0.25 -2 9.31321e-008 0.25 -6 0 1.19209e-007 -SURF 0x0 -mat 4 -refs 4 -7 0.5 0 -6 0 1.19209e-007 -5 0 1.19209e-007 -4 0.5 0 -kids 0 -OBJECT poly -name "EmerElecManOnBtn2O" -loc 0.000228064 -0.112692 -0.000865825 -data 8 -Cube.135 -texture "buttons4.png" -crease 30.000000 -numvert 8 --0.003448 0.0683 0.193106 --0.000968002 0.0683 0.212952 --0.003944 0.0683 0.213324 --0.006425 0.0683 0.193478 --0.003448 0.0583 0.193106 --0.000968002 0.0583 0.212952 --0.003944 0.0583 0.213324 --0.006425 0.0583 0.193478 -numsurf 4 -SURF 0x0 -mat 4 -refs 4 -0 0.5 0.5 -3 0.5 0.5 -2 9.31321e-008 0.5 -1 9.31321e-008 0.5 -SURF 0x0 -mat 4 -refs 4 -4 0.5 0.25 -0 0.5 0.5 -1 9.31321e-008 0.5 -5 0 0.25 -SURF 0x0 -mat 4 -refs 4 -5 0 0.25 -1 9.31321e-008 0.5 -2 9.31321e-008 0.5 -6 0 0.25 -SURF 0x0 -mat 4 -refs 4 -7 0.5 0.25 -3 0.5 0.5 -0 0.5 0.5 -4 0.5 0.25 -kids 0 -OBJECT poly -name "EmerGenTestGaurd" +name "EmerGenTestGuard" loc 0.00869153 -0.0442504 0.292258 texture "blackguard.png" crease 35.000000 @@ -21077,144 +22241,6 @@ refs 3 24 0 0 kids 0 OBJECT poly -name "MaskManOnBtn1" -loc 0.00845453 -0.0838674 0.067745 -data 8 -Cube.123 -texture "buttons.png" -crease 30.000000 -numvert 8 --0.006909 -0.0904 0.189608 --0.004428 -0.0904 0.209454 --0.001451 -0.0904 0.209082 --0.003932 -0.0904 0.189236 --0.006909 -0.0804 0.189608 --0.004428 -0.0804 0.209454 --0.001451 -0.0804 0.209082 --0.003932 -0.0804 0.189236 -numsurf 4 -SURF 0x0 -mat 4 -refs 4 -0 0.5 0.25 -4 0.5 0.5 -7 0.5 0.5 -3 0.5 0.25 -SURF 0x0 -mat 4 -refs 4 -2 0 0.25 -6 9.31321e-008 0.5 -5 9.31321e-008 0.5 -1 0 0.25 -SURF 0x0 -mat 4 -refs 4 -3 0.5 0.25 -7 0.5 0.5 -6 9.31321e-008 0.5 -2 0 0.25 -SURF 0x0 -mat 4 -refs 4 -7 0.5 0.5 -4 0.5 0.5 -5 9.31321e-008 0.5 -6 9.31321e-008 0.5 -kids 0 -OBJECT poly -name "MaskManOnBtn2" -loc 0.00845453 -0.0838674 0.067745 -data 8 -Cube.124 -texture "buttons.png" -crease 30.000000 -numvert 8 --0.003932 -0.1004 0.189236 --0.001451 -0.1004 0.209082 --0.004428 -0.1004 0.209454 --0.006909 -0.1004 0.189608 --0.003932 -0.0904 0.189236 --0.001451 -0.0904 0.209082 --0.004428 -0.0904 0.209454 --0.006909 -0.0904 0.189608 -numsurf 4 -SURF 0x0 -mat 4 -refs 4 -0 0.5 0 -1 0 1.19209e-007 -2 0 1.19209e-007 -3 0.5 0 -SURF 0x0 -mat 4 -refs 4 -0 0.5 0 -4 0.5 0.25 -5 9.31321e-008 0.25 -1 0 1.19209e-007 -SURF 0x0 -mat 4 -refs 4 -1 0 1.19209e-007 -5 9.31321e-008 0.25 -6 9.31321e-008 0.25 -2 0 1.19209e-007 -SURF 0x0 -mat 4 -refs 4 -4 0.5 0.25 -0 0.5 0 -3 0.5 0 -7 0.5 0.25 -kids 0 -OBJECT poly -name "MaskManOnBtn2O" -loc 0.00811153 -0.242567 0.063875 -data 8 -Cube.135 -texture "buttons4.png" -crease 30.000000 -numvert 8 --0.006425 0.0583 0.193478 --0.003944 0.0583 0.213324 --0.000968002 0.0583 0.212952 --0.003448 0.0583 0.193106 --0.006425 0.0683 0.193478 --0.003944 0.0683 0.213324 --0.000968002 0.0683 0.212952 --0.003448 0.0683 0.193106 -numsurf 4 -SURF 0x0 -mat 4 -refs 4 -0 0.5 0.25 -4 0.5 0.5 -7 0.5 0.5 -3 0.5 0.25 -SURF 0x0 -mat 4 -refs 4 -2 0 0.25 -6 9.31321e-008 0.5 -5 9.31321e-008 0.5 -1 0 0.25 -SURF 0x0 -mat 4 -refs 4 -3 0.5 0.25 -7 0.5 0.5 -6 9.31321e-008 0.5 -2 0 0.25 -SURF 0x0 -mat 4 -refs 4 -7 0.5 0.5 -4 0.5 0.5 -5 9.31321e-008 0.5 -6 9.31321e-008 0.5 -kids 0 -OBJECT poly name "RamAirBtnProt" loc 7.09913 -5.70618 0.00208944 texture "protectblack.jpg" @@ -30672,7 +31698,7 @@ refs 4 kids 0 OBJECT poly name "RATMan" -loc 0.000176536 0.348484 0.0915874 +loc 0.000176536 0.346701 0.0912134 data 12 Cylinder.061 crease 30.000000 @@ -61315,7 +62341,7 @@ refs 4 4 0.5 0 kids 0 OBJECT poly -name "MaskManOnGaurd" +name "MaskManOnGuard" loc 0.00568402 -0.174035 0.267115 texture "redguard.png" crease 35.000000 diff --git a/revision.txt b/revision.txt index 1d1a6f55..0e8ebf59 100644 --- a/revision.txt +++ b/revision.txt @@ -1 +1 @@ -1475 \ No newline at end of file +1476 \ No newline at end of file