New locks, burning FOEQ, centrifuge model and cemplant texture, sirens

This commit is contained in:
HbmMods 2018-10-06 17:03:28 +02:00
parent a3c69243f0
commit af94003986
56 changed files with 13183 additions and 91 deletions

View File

@ -265,7 +265,10 @@ item.turret_biometry.name=Geschütz-Telemetriekarte
item.key.name=Schlüssel
item.key_red.name=Roter Schlüssel
item.pin.name=Haarklammer
item.padlock_rusty.name=Rostiges Vorhängeschloss
item.padlock.name=Vorhängeschloss
item.padlock_reinforced.name=Verstärktes Vorhängeschloss
item.padlock_unbreakable.name=Unzerstörbares Vorhängeschloss
tile.machine_keyforge.name=Schlossertisch
container.keyForge=Schlossertisch
@ -1351,6 +1354,7 @@ item.jetpack_boost.name=Boosterrucksack
item.jetpack_fly.name=Raketenrucksack
item.jetpack_break.name=Bremsrucksack
item.jetpack_vector.name=Schubvektorgesteuerter Raketenrucksack
item.jetpack_tank.name=Raketenrucksack-Reservetank
item.chainsaw.name=Kettensäge
item.crowbar.name=Mk.V Kistenöffnungsapparat "Brechstange"

View File

@ -278,7 +278,10 @@ item.turret_biometry.name=Turret Telemetry Card
item.key.name=Key
item.key_red.name=Red Key
item.pin.name=Bobby Pin
item.padlock_rusty.name=Rusty Padlock
item.padlock.name=Padlock
item.padlock_reinforced.name=Reinforced Padlock
item.padlock_unbreakable.name=Unbreakable Padlock
tile.machine_keyforge.name=Locksmith Table
container.keyForge=Locksmith Table
@ -1351,6 +1354,7 @@ item.jetpack_boost.name=Boostpack
item.jetpack_fly.name=Jetpack
item.jetpack_break.name=Breakpack
item.jetpack_vector.name=Vectored Jetpack
item.jetpack_tank.name=Jetpack Reserve Fuel Tank
item.chainsaw.name=Chainsaw
item.crowbar.name=Mk.V Crate Opening Device "Crowbar"

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,892 @@
# Blender v2.76 (sub 0) OBJ File: 'centrifuge_new.blend'
# www.blender.org
o Cube_Cube.001
v -0.500000 0.000000 0.500000
v -0.500000 1.000000 0.500000
v -0.500000 0.000000 -0.500000
v -0.500000 1.000000 -0.500000
v 0.500000 0.000000 0.500000
v 0.500000 1.000000 0.500000
v 0.500000 0.000000 -0.500000
v 0.500000 1.000000 -0.500000
v -0.500000 0.343750 0.156250
v -0.500000 0.656250 0.156250
v -0.500000 0.343750 -0.156250
v -0.500000 0.656250 -0.156250
v 0.500000 0.343750 0.156250
v 0.500000 0.656250 0.156250
v 0.500000 0.343750 -0.156250
v 0.500000 0.656250 -0.156250
v 0.156250 0.343750 0.500000
v 0.156250 0.656250 0.500000
v -0.156250 0.343750 0.500000
v -0.156250 0.656250 0.500000
v 0.156250 0.343750 -0.500000
v 0.156250 0.656250 -0.500000
v -0.156250 0.343750 -0.500000
v -0.156250 0.656250 -0.500000
v -0.250000 0.250000 0.500000
v -0.250000 0.750000 0.500000
v -0.250000 0.250000 -0.500000
v -0.250000 0.750000 -0.500000
v 0.250000 0.250000 0.500000
v 0.250000 0.750000 0.500000
v 0.250000 0.250000 -0.500000
v 0.250000 0.750000 -0.500000
v 0.500000 0.250000 0.250000
v 0.500000 0.750000 0.250000
v -0.500000 0.250000 0.250000
v -0.500000 0.750000 0.250000
v 0.500000 0.250000 -0.250000
v 0.500000 0.750000 -0.250000
v -0.500000 0.250000 -0.250000
v -0.500000 0.750000 -0.250000
v -0.250000 0.750000 -0.437500
v 0.250000 0.750000 -0.437500
v 0.250000 0.250000 -0.437500
v -0.250000 0.250000 -0.437500
v 0.250000 0.750000 0.437500
v -0.250000 0.750000 0.437500
v -0.250000 0.250000 0.437500
v 0.250000 0.250000 0.437500
v -0.437500 0.750000 0.250000
v -0.437500 0.750000 -0.250000
v -0.437500 0.250000 -0.250000
v -0.437500 0.250000 0.250000
v 0.437500 0.750000 -0.250000
v 0.437500 0.750000 0.250000
v 0.437500 0.250000 0.250000
v 0.437500 0.250000 -0.250000
v -0.437500 0.656250 0.156250
v -0.437500 0.343750 0.156250
v -0.437500 0.343750 -0.156250
v -0.437500 0.656250 -0.156250
v 0.437500 0.656250 -0.156250
v 0.437500 0.343750 -0.156250
v 0.437500 0.343750 0.156250
v 0.437500 0.656250 0.156250
v 0.156250 0.656250 0.437500
v 0.156250 0.343750 0.437500
v -0.156250 0.343750 0.437500
v -0.156250 0.656250 0.437500
v -0.156250 0.656250 -0.437500
v -0.156250 0.343750 -0.437500
v 0.156250 0.343750 -0.437500
v 0.156250 0.656250 -0.437500
v 0.250000 2.900000 -0.450000
v 0.250000 1.000000 -0.450000
v 0.250000 1.000000 0.050000
v 0.250000 2.900000 0.050000
v 0.391421 1.000000 0.108579
v 0.391421 2.900000 0.108579
v 0.450000 1.000000 0.250000
v 0.450000 2.900000 0.250000
v 0.391421 1.000000 0.391421
v 0.391421 2.900000 0.391421
v 0.250000 1.000000 0.450000
v 0.250000 2.900000 0.450000
v 0.108579 1.000000 0.391421
v 0.108579 2.900000 0.391421
v 0.050000 1.000000 0.250000
v 0.050000 2.900000 0.250000
v 0.108579 1.000000 0.108579
v 0.108579 2.900000 0.108579
v 0.391421 1.000000 -0.391421
v 0.391421 2.900000 -0.391421
v 0.450000 1.000000 -0.250000
v 0.450000 2.900000 -0.250000
v 0.391421 1.000000 -0.108579
v 0.391421 2.900000 -0.108579
v 0.250000 1.000000 -0.050000
v 0.250000 2.900000 -0.050000
v 0.108579 1.000000 -0.108579
v 0.108579 2.900000 -0.108579
v 0.050000 1.000000 -0.250000
v 0.050000 2.900000 -0.250000
v 0.108579 1.000000 -0.391421
v 0.108579 2.900000 -0.391421
v -0.250000 2.900000 -0.450000
v -0.250000 1.000000 -0.450000
v -0.250000 1.000000 0.050000
v -0.250000 2.900000 0.050000
v -0.108579 1.000000 0.108579
v -0.108579 2.900000 0.108579
v -0.050000 1.000000 0.250000
v -0.050000 2.900000 0.250000
v -0.108579 1.000000 0.391421
v -0.108579 2.900000 0.391421
v -0.250000 1.000000 0.450000
v -0.250000 2.900000 0.450000
v -0.391421 1.000000 0.391421
v -0.391421 2.900000 0.391421
v -0.450000 1.000000 0.250000
v -0.450000 2.900000 0.250000
v -0.391421 1.000000 0.108579
v -0.391421 2.900000 0.108579
v -0.108579 1.000000 -0.391421
v -0.108579 2.900000 -0.391421
v -0.050000 1.000000 -0.250000
v -0.050000 2.900000 -0.250000
v -0.108579 1.000000 -0.108579
v -0.108579 2.900000 -0.108579
v -0.250000 1.000000 -0.050000
v -0.250000 2.900000 -0.050000
v -0.391421 1.000000 -0.108579
v -0.391421 2.900000 -0.108579
v -0.450000 1.000000 -0.250000
v -0.450000 2.900000 -0.250000
v -0.391421 1.000000 -0.391421
v -0.391421 2.900000 -0.391421
v 0.320711 2.950000 0.179289
v 0.250000 2.950000 0.150000
v 0.179289 2.950000 0.179289
v 0.150000 2.950000 0.250000
v 0.179289 2.950000 0.320711
v 0.250000 2.950000 0.350000
v 0.320711 2.950000 0.320711
v 0.350000 2.950000 0.250000
v 0.320711 2.950000 -0.320711
v 0.250000 2.950000 -0.350000
v 0.179289 2.950000 -0.320711
v 0.150000 2.950000 -0.250000
v 0.179289 2.950000 -0.179289
v 0.250000 2.950000 -0.150000
v 0.320711 2.950000 -0.179289
v 0.350000 2.950000 -0.250000
v -0.179289 2.950000 0.179289
v -0.250000 2.950000 0.150000
v -0.320711 2.950000 0.179289
v -0.350000 2.950000 0.250000
v -0.320711 2.950000 0.320711
v -0.250000 2.950000 0.350000
v -0.179289 2.950000 0.320711
v -0.150000 2.950000 0.250000
v -0.179289 2.950000 -0.320711
v -0.250000 2.950000 -0.350000
v -0.320711 2.950000 -0.320711
v -0.350000 2.950000 -0.250000
v -0.320711 2.950000 -0.179289
v -0.250000 2.950000 -0.150000
v -0.179289 2.950000 -0.179289
v -0.150000 2.950000 -0.250000
v 0.100000 1.000000 -0.064645
v 0.100000 3.000000 -0.064645
v 0.064645 1.000000 -0.100000
v 0.064645 3.000000 -0.100000
v 0.135355 1.000000 -0.100000
v 0.135355 3.000000 -0.100000
v 0.100000 1.000000 -0.135355
v 0.100000 3.000000 -0.135355
v 0.100000 3.050000 -0.064645
v 0.064645 3.050000 -0.100000
v 0.100000 3.050000 -0.135355
v 0.135355 3.050000 -0.100000
v 0.250000 3.050000 -0.214645
v 0.214645 3.050000 -0.250000
v 0.250000 3.050000 -0.285355
v 0.285355 3.050000 -0.250000
v 0.250000 3.000000 -0.214645
v 0.214645 3.000000 -0.250000
v 0.250000 3.000000 -0.285355
v 0.285355 3.000000 -0.250000
v 0.250000 2.950000 -0.214645
v 0.214645 2.950000 -0.250000
v 0.250000 2.950000 -0.285355
v 0.285355 2.950000 -0.250000
v 0.100000 1.000000 0.435355
v 0.100000 3.000000 0.435355
v 0.064645 1.000000 0.400000
v 0.064645 3.000000 0.400000
v 0.135355 1.000000 0.400000
v 0.135355 3.000000 0.400000
v 0.100000 1.000000 0.364645
v 0.100000 3.000000 0.364645
v 0.100000 3.050000 0.435355
v 0.064645 3.050000 0.400000
v 0.100000 3.050000 0.364645
v 0.135355 3.050000 0.400000
v 0.250000 3.050000 0.285355
v 0.214645 3.050000 0.250000
v 0.250000 3.050000 0.214645
v 0.285355 3.050000 0.250000
v 0.250000 3.000000 0.285355
v 0.214645 3.000000 0.250000
v 0.250000 3.000000 0.214645
v 0.285355 3.000000 0.250000
v 0.250000 2.950000 0.285355
v 0.214645 2.950000 0.250000
v 0.250000 2.950000 0.214645
v 0.285355 2.950000 0.250000
v -0.400000 1.000000 0.435355
v -0.400000 3.000000 0.435355
v -0.435355 1.000000 0.400000
v -0.435355 3.000000 0.400000
v -0.364645 1.000000 0.400000
v -0.364645 3.000000 0.400000
v -0.400000 1.000000 0.364645
v -0.400000 3.000000 0.364645
v -0.400000 3.050000 0.435355
v -0.435355 3.050000 0.400000
v -0.400000 3.050000 0.364645
v -0.364645 3.050000 0.400000
v -0.250000 3.050000 0.285355
v -0.285355 3.050000 0.250000
v -0.250000 3.050000 0.214645
v -0.214645 3.050000 0.250000
v -0.250000 3.000000 0.285355
v -0.285355 3.000000 0.250000
v -0.250000 3.000000 0.214645
v -0.214645 3.000000 0.250000
v -0.250000 2.950000 0.285355
v -0.285355 2.950000 0.250000
v -0.250000 2.950000 0.214645
v -0.214645 2.950000 0.250000
v -0.400000 1.000000 -0.064645
v -0.400000 3.000000 -0.064645
v -0.435355 1.000000 -0.100000
v -0.435355 3.000000 -0.100000
v -0.364645 1.000000 -0.100000
v -0.364645 3.000000 -0.100000
v -0.400000 1.000000 -0.135355
v -0.400000 3.000000 -0.135355
v -0.400000 3.050000 -0.064645
v -0.435355 3.050000 -0.100000
v -0.400000 3.050000 -0.135355
v -0.364645 3.050000 -0.100000
v -0.250000 3.050000 -0.214645
v -0.285355 3.050000 -0.250000
v -0.250000 3.050000 -0.285355
v -0.214645 3.050000 -0.250000
v -0.250000 3.000000 -0.214645
v -0.285355 3.000000 -0.250000
v -0.250000 3.000000 -0.285355
v -0.214645 3.000000 -0.250000
v -0.250000 2.950000 -0.214645
v -0.285355 2.950000 -0.250000
v -0.250000 2.950000 -0.285355
v -0.214645 2.950000 -0.250000
vt 0.701660 0.375647
vt 0.946433 0.375647
vt 0.946433 0.620421
vt 0.672309 0.620421
vt 0.427535 0.620421
vt 0.427535 0.375647
vt 0.659005 0.781669
vt 0.636057 0.758722
vt 0.636057 0.682230
vt 0.659005 0.659283
vt 0.559565 0.682230
vt 0.559565 0.758722
vt 0.536618 0.781669
vt 0.804957 0.737815
vt 0.728465 0.737815
vt 0.728465 0.661323
vt 0.069977 0.288624
vt 0.192364 0.288624
vt 0.253557 0.349817
vt 0.192364 0.166237
vt 0.069977 0.166237
vt 0.008784 0.105043
vt 0.804298 0.288624
vt 0.926685 0.288624
vt 0.987879 0.349817
vt 0.926685 0.166237
vt 0.804298 0.166237
vt 0.743105 0.105044
vt 0.559525 0.288624
vt 0.681911 0.288624
vt 0.743105 0.349817
vt 0.681911 0.166237
vt 0.559525 0.166237
vt 0.498331 0.105044
vt 0.314751 0.288624
vt 0.437138 0.288624
vt 0.498331 0.349817
vt 0.437138 0.166237
vt 0.314751 0.166237
vt 0.253557 0.105044
vt 0.987878 0.105043
vt 0.008784 0.349817
vt 0.659005 0.796968
vt 0.536618 0.659282
vt 0.521320 0.781669
vt 0.536618 0.643984
vt 0.674303 0.659282
vt 0.820255 0.661323
vt 0.820255 0.737815
vt 0.728465 0.646025
vt 0.804957 0.646025
vt 0.804957 0.661323
vt 0.713167 0.737815
vt 0.713167 0.661323
vt 0.804957 0.753113
vt 0.728465 0.753113
vt 0.050903 0.836838
vt 0.013435 0.836838
vt 0.013433 0.371769
vt 0.238245 0.836838
vt 0.200776 0.836838
vt 0.200776 0.371768
vt 0.088372 0.836838
vt 0.050902 0.371769
vt 0.163308 0.836838
vt 0.163307 0.371768
vt 0.125840 0.836838
vt 0.088370 0.371769
vt 0.125839 0.371769
vt 0.377931 0.861153
vt 0.377931 0.371601
vt 0.390169 0.371601
vt 0.313181 0.836838
vt 0.275713 0.836838
vt 0.275713 0.371768
vt 0.238244 0.371768
vt 0.353454 0.861153
vt 0.353454 0.371601
vt 0.365692 0.371601
vt 0.365692 0.861153
vt 0.341215 0.861153
vt 0.341216 0.371601
vt 0.875778 0.677068
vt 0.889025 0.645087
vt 0.921006 0.658334
vt 0.228878 0.862551
vt 0.210143 0.862551
vt 0.266346 0.862551
vt 0.247612 0.862551
vt 0.303814 0.862551
vt 0.285080 0.862551
vt 0.041536 0.862552
vt 0.022802 0.862552
vt 0.079004 0.862551
vt 0.060270 0.862552
vt 0.116473 0.862551
vt 0.097739 0.862551
vt 0.153941 0.862551
vt 0.135207 0.862551
vt 0.191409 0.862551
vt 0.172675 0.862551
vt 0.875778 0.658334
vt 0.907759 0.645087
vt 0.921006 0.677068
vt 0.443375 0.716201
vt 0.431136 0.716201
vt 0.431136 0.676515
vt 0.455614 0.676515
vt 0.455614 0.664276
vt 0.467852 0.664276
vt 0.467852 0.652038
vt 0.480091 0.676515
vt 0.467852 0.676515
vt 0.443375 0.664276
vt 0.455614 0.728439
vt 0.455614 0.716201
vt 0.467852 0.716201
vt 0.888254 0.732063
vt 0.888254 0.719824
vt 0.900493 0.719824
vt 0.480091 0.716201
vt 0.480091 0.728439
vt 0.443375 0.728439
vt 0.467852 0.728439
vt 0.467852 0.740678
vt 0.455614 0.740678
vt 0.912731 0.732063
vt 0.912731 0.719824
vt 0.924970 0.719824
vt 0.900493 0.732063
vt 0.876015 0.732063
vt 0.876015 0.719824
vt 0.924970 0.732063
vt 0.701660 0.620421
vt 0.672309 0.375647
vt 0.536618 0.796968
vt 0.521320 0.659282
vt 0.659005 0.643984
vt 0.674303 0.781669
vt 0.390170 0.861153
vt 0.313181 0.371768
vt 0.907759 0.690316
vt 0.889025 0.690315
vt 0.443375 0.676515
vt 0.455614 0.652038
vt 0.480091 0.664276
vn 0.000000 -1.000000 0.000000
vn 0.000000 1.000000 0.000000
vn -1.000000 0.000000 0.000000
vn 0.000000 0.000000 1.000000
vn 0.000000 0.000000 -1.000000
vn 1.000000 0.000000 0.000000
vn -0.923900 0.000000 0.382700
vn 0.382700 0.000000 -0.923900
vn -0.382700 0.000000 0.923900
vn 0.923900 0.000000 -0.382700
vn 0.382700 0.000000 0.923900
vn 0.923900 0.000000 0.382700
vn -0.707100 0.000000 -0.707100
vn -0.923900 0.000000 -0.382700
vn -0.382700 0.000000 -0.923900
vn 0.707100 0.000000 0.707100
vn 0.707100 0.000000 -0.707100
vn -0.707100 0.000000 0.707100
vn 0.182100 0.879500 -0.439700
vn -0.182100 0.879500 -0.439700
vn -0.439700 0.879500 -0.182100
vn -0.439700 0.879500 0.182100
vn -0.182100 0.879500 0.439700
vn 0.182100 0.879500 0.439700
vn 0.439700 0.879500 0.182100
vn 0.439700 0.879500 -0.182100
s off
f 3/1/1 7/2/1 5/3/1
f 8/4/2 4/5/2 2/6/2
f 49/7/3 57/8/3 58/9/3
f 52/10/3 58/9/3 59/11/3
f 59/11/3 60/12/3 50/13/3
f 18/14/4 20/15/4 19/16/4
f 27/17/5 31/18/5 7/19/5
f 32/20/5 28/21/5 4/22/5
f 35/23/3 39/24/3 3/25/3
f 40/26/3 36/27/3 2/28/3
f 29/29/4 25/30/4 1/31/4
f 26/32/4 30/33/4 6/34/4
f 37/35/6 33/36/6 5/37/6
f 34/38/6 38/39/6 8/40/6
f 6/34/6 5/37/6 33/36/6
f 29/29/4 5/37/4 6/34/4
f 2/28/4 1/31/4 25/30/4
f 35/23/3 1/31/3 2/28/3
f 4/41/3 3/25/3 39/24/3
f 27/17/5 3/42/5 4/22/5
f 8/40/5 7/19/5 31/18/5
f 37/35/6 7/19/6 8/40/6
f 42/13/1 41/7/1 28/43/1
f 43/44/3 42/13/3 32/45/3
f 44/10/2 43/44/2 31/46/2
f 41/7/6 44/10/6 27/47/6
f 46/13/1 45/7/1 30/43/1
f 47/44/6 46/13/6 26/45/6
f 48/10/2 47/44/2 25/46/2
f 45/7/3 48/10/3 29/47/3
f 50/13/1 49/7/1 36/43/1
f 51/44/4 50/13/4 40/45/4
f 52/10/2 51/44/2 39/46/2
f 49/7/5 52/10/5 35/47/5
f 54/13/1 53/7/1 38/43/1
f 55/44/5 54/13/5 34/45/5
f 56/10/2 55/44/2 33/46/2
f 53/7/4 56/10/4 37/47/4
f 47/44/4 67/11/4 68/12/4
f 58/48/4 57/49/4 10/14/4
f 59/50/1 58/51/1 9/52/1
f 60/53/5 59/54/5 11/16/5
f 57/55/2 60/56/2 12/15/2
f 46/13/4 68/12/4 65/8/4
f 62/48/5 61/49/5 16/14/5
f 63/50/1 62/51/1 15/52/1
f 64/53/4 63/54/4 13/16/4
f 61/55/2 64/56/2 14/15/2
f 65/8/4 66/9/4 48/10/4
f 66/48/6 65/49/6 18/14/6
f 67/50/1 66/51/1 17/52/1
f 68/53/3 67/54/3 19/16/3
f 65/55/2 68/56/2 20/15/2
f 66/9/4 67/11/4 47/44/4
f 70/48/3 69/49/3 24/14/3
f 71/50/1 70/51/1 23/52/1
f 72/53/6 71/54/6 21/16/6
f 69/55/2 72/56/2 22/15/2
f 60/12/3 57/8/3 49/7/3
f 43/44/5 71/11/5 72/12/5
f 70/9/5 71/11/5 43/44/5
f 69/8/5 70/9/5 44/10/5
f 42/13/5 72/12/5 69/8/5
f 63/11/6 64/12/6 54/13/6
f 56/10/6 62/9/6 63/11/6
f 53/7/6 61/8/6 62/9/6
f 64/12/6 61/8/6 53/7/6
f 10/14/3 12/15/3 11/16/3
f 24/14/5 22/15/5 21/16/5
f 16/14/6 14/15/6 13/16/6
f 100/57/7 102/58/7 101/59/7
f 76/60/8 78/61/8 77/62/8
f 98/63/9 100/57/9 99/64/9
f 78/61/10 80/65/10 79/66/10
f 96/67/11 98/63/11 97/68/11
f 80/65/12 82/67/12 81/69/12
f 200/70/13 199/71/13 195/72/13
f 94/65/12 96/67/12 95/69/12
f 82/67/11 84/63/11 83/68/11
f 102/73/14 104/74/14 103/75/14
f 92/61/10 94/65/10 93/66/10
f 84/63/9 86/57/9 85/64/9
f 104/74/15 73/60/15 74/76/15
f 73/60/8 92/61/8 91/62/8
f 86/57/7 88/58/7 87/59/7
f 170/77/16 169/78/16 173/79/16
f 90/74/15 76/60/15 75/76/15
f 88/73/14 90/74/14 89/75/14
f 174/80/17 173/79/17 175/71/17
f 198/80/17 197/79/17 199/71/17
f 132/57/7 134/58/7 133/59/7
f 108/60/8 110/61/8 109/62/8
f 130/63/9 132/57/9 131/64/9
f 110/61/10 112/65/10 111/66/10
f 128/67/11 130/63/11 129/68/11
f 112/65/12 114/67/12 113/69/12
f 194/77/16 193/78/16 197/79/16
f 126/65/12 128/67/12 127/69/12
f 114/67/11 116/63/11 115/68/11
f 134/73/14 136/74/14 135/75/14
f 124/61/10 126/65/10 125/66/10
f 116/63/9 118/57/9 117/64/9
f 136/74/15 105/60/15 106/76/15
f 105/60/8 124/61/8 123/62/8
f 118/57/7 120/58/7 119/59/7
f 176/70/13 175/71/13 171/72/13
f 122/74/15 108/60/15 107/76/15
f 120/73/14 122/74/14 121/75/14
f 172/81/18 171/82/18 169/78/18
f 140/83/2 142/84/2 144/85/2
f 76/60/19 138/86/19 137/87/19
f 139/88/20 138/89/20 76/60/20
f 140/90/21 139/91/21 90/74/21
f 141/92/22 140/93/22 88/58/22
f 142/94/23 141/95/23 86/57/23
f 143/96/24 142/97/24 84/63/24
f 144/98/25 143/99/25 82/67/25
f 137/100/26 144/101/26 80/65/26
f 148/83/2 150/84/2 152/85/2
f 73/60/19 146/86/19 145/87/19
f 104/74/20 147/88/20 146/89/20
f 148/90/21 147/91/21 104/74/21
f 100/57/22 149/92/22 148/93/22
f 98/63/23 150/94/23 149/95/23
f 151/96/24 150/97/24 98/63/24
f 152/98/25 151/99/25 96/67/25
f 92/61/26 145/100/26 152/101/26
f 156/102/2 158/103/2 160/104/2
f 108/60/19 154/86/19 153/87/19
f 155/88/20 154/89/20 108/60/20
f 156/90/21 155/91/21 122/74/21
f 118/57/22 157/92/22 156/93/22
f 158/94/23 157/95/23 118/57/23
f 114/67/24 159/96/24 158/97/24
f 160/98/25 159/99/25 114/67/25
f 153/100/26 160/101/26 112/65/26
f 164/102/2 166/103/2 168/104/2
f 162/86/19 161/87/19 124/61/19
f 136/74/20 163/88/20 162/89/20
f 164/90/21 163/91/21 136/74/21
f 132/57/22 165/92/22 164/93/22
f 166/94/23 165/95/23 132/57/23
f 128/67/24 167/96/24 166/97/24
f 168/98/25 167/99/25 128/67/25
f 124/61/26 161/100/26 168/101/26
f 186/105/1 185/106/1 174/107/1
f 179/108/2 178/109/2 177/110/2
f 170/111/18 177/110/18 178/109/18
f 174/112/16 180/113/16 177/110/16
f 172/114/13 178/109/13 179/108/13
f 183/115/2 182/116/2 181/117/2
f 185/118/16 189/119/16 192/120/16
f 179/108/13 182/116/13 186/105/13
f 181/117/16 185/121/16 188/122/16
f 183/115/13 187/123/13 186/105/13
f 184/124/17 188/125/17 187/126/17
f 180/113/2 181/117/2 182/116/2
f 187/127/13 191/128/13 190/129/13
f 188/130/17 192/120/17 191/128/17
f 186/131/18 190/132/18 189/119/18
f 174/112/16 185/121/16 181/117/16
f 196/81/18 195/82/18 193/78/18
f 210/105/1 209/106/1 198/107/1
f 203/108/2 202/109/2 201/110/2
f 194/111/18 201/110/18 202/109/18
f 198/112/16 204/113/16 201/110/16
f 196/114/13 202/109/13 203/108/13
f 207/115/2 206/116/2 205/117/2
f 209/118/16 213/119/16 216/120/16
f 203/108/13 206/116/13 210/105/13
f 205/117/16 209/121/16 212/122/16
f 207/115/13 211/123/13 210/105/13
f 208/124/17 212/125/17 211/126/17
f 204/113/2 205/117/2 206/116/2
f 211/127/13 215/128/13 214/129/13
f 212/130/17 216/120/17 215/128/17
f 210/131/18 214/132/18 213/119/18
f 198/112/16 209/121/16 205/117/16
f 224/70/13 223/71/13 219/72/13
f 222/80/17 221/79/17 223/71/17
f 218/77/16 217/78/16 221/79/16
f 220/81/18 219/82/18 217/78/18
f 234/105/1 233/106/1 222/107/1
f 227/108/2 226/109/2 225/110/2
f 218/111/18 225/110/18 226/109/18
f 222/112/16 228/113/16 225/110/16
f 220/114/13 226/109/13 227/108/13
f 231/115/2 230/116/2 229/117/2
f 233/118/16 237/119/16 240/120/16
f 227/108/13 230/116/13 234/105/13
f 229/117/16 233/121/16 236/122/16
f 231/115/13 235/123/13 234/105/13
f 232/124/17 236/125/17 235/126/17
f 228/113/2 229/117/2 230/116/2
f 235/127/13 239/128/13 238/129/13
f 236/130/17 240/120/17 239/128/17
f 234/131/18 238/132/18 237/119/18
f 222/112/16 233/121/16 229/117/16
f 248/70/13 247/71/13 243/72/13
f 246/80/17 245/79/17 247/71/17
f 242/77/16 241/78/16 245/79/16
f 244/81/18 243/82/18 241/78/18
f 258/105/1 257/106/1 246/107/1
f 251/108/2 250/109/2 249/110/2
f 242/111/18 249/110/18 250/109/18
f 246/112/16 252/113/16 249/110/16
f 244/114/13 250/109/13 251/108/13
f 255/115/2 254/116/2 253/117/2
f 257/128/16 261/127/16 264/130/16
f 251/108/13 254/116/13 258/105/13
f 253/117/16 257/121/16 260/122/16
f 255/115/13 259/123/13 258/105/13
f 256/124/17 260/125/17 259/126/17
f 252/113/2 253/117/2 254/116/2
f 259/119/13 263/118/13 262/131/13
f 260/120/17 264/130/17 263/118/17
f 258/129/18 262/133/18 261/127/18
f 246/112/16 257/121/16 253/117/16
f 1/134/1 3/1/1 5/3/1
f 6/135/2 8/4/2 2/6/2
f 52/10/3 49/7/3 58/9/3
f 51/44/3 52/10/3 59/11/3
f 51/44/3 59/11/3 50/13/3
f 17/52/4 18/14/4 19/16/4
f 3/42/5 27/17/5 7/19/5
f 8/40/5 32/20/5 4/22/5
f 1/31/3 35/23/3 3/25/3
f 4/41/3 40/26/3 2/28/3
f 5/37/4 29/29/4 1/31/4
f 2/28/4 26/32/4 6/34/4
f 7/19/6 37/35/6 5/37/6
f 6/34/6 34/38/6 8/40/6
f 34/38/6 6/34/6 33/36/6
f 30/33/4 29/29/4 6/34/4
f 26/32/4 2/28/4 25/30/4
f 36/27/3 35/23/3 2/28/3
f 40/26/3 4/41/3 39/24/3
f 28/21/5 27/17/5 4/22/5
f 32/20/5 8/40/5 31/18/5
f 38/39/6 37/35/6 8/40/6
f 32/136/1 42/13/1 28/43/1
f 31/137/3 43/44/3 32/45/3
f 27/138/2 44/10/2 31/46/2
f 28/139/6 41/7/6 27/47/6
f 26/136/1 46/13/1 30/43/1
f 25/137/6 47/44/6 26/45/6
f 29/138/2 48/10/2 25/46/2
f 30/139/3 45/7/3 29/47/3
f 40/136/1 50/13/1 36/43/1
f 39/137/4 51/44/4 40/45/4
f 35/138/2 52/10/2 39/46/2
f 36/139/5 49/7/5 35/47/5
f 34/136/1 54/13/1 38/43/1
f 33/137/5 55/44/5 34/45/5
f 37/138/2 56/10/2 33/46/2
f 38/139/4 53/7/4 37/47/4
f 46/13/4 47/44/4 68/12/4
f 9/52/4 58/48/4 10/14/4
f 11/16/1 59/50/1 9/52/1
f 12/15/5 60/53/5 11/16/5
f 10/14/2 57/55/2 12/15/2
f 45/7/4 46/13/4 65/8/4
f 15/52/5 62/48/5 16/14/5
f 13/16/1 63/50/1 15/52/1
f 14/15/4 64/53/4 13/16/4
f 16/14/2 61/55/2 14/15/2
f 45/7/4 65/8/4 48/10/4
f 17/52/6 66/48/6 18/14/6
f 19/16/1 67/50/1 17/52/1
f 20/15/3 68/53/3 19/16/3
f 18/14/2 65/55/2 20/15/2
f 48/10/4 66/9/4 47/44/4
f 23/52/3 70/48/3 24/14/3
f 21/16/1 71/50/1 23/52/1
f 22/15/6 72/53/6 21/16/6
f 24/14/2 69/55/2 22/15/2
f 50/13/3 60/12/3 49/7/3
f 42/13/5 43/44/5 72/12/5
f 44/10/5 70/9/5 43/44/5
f 41/7/5 69/8/5 44/10/5
f 41/7/5 42/13/5 69/8/5
f 55/44/6 63/11/6 54/13/6
f 55/44/6 56/10/6 63/11/6
f 56/10/6 53/7/6 62/9/6
f 54/13/6 64/12/6 53/7/6
f 9/52/3 10/14/3 11/16/3
f 23/52/5 24/14/5 21/16/5
f 15/52/6 16/14/6 13/16/6
f 99/64/7 100/57/7 101/59/7
f 75/76/8 76/60/8 77/62/8
f 97/68/9 98/63/9 99/64/9
f 77/62/10 78/61/10 79/66/10
f 95/69/11 96/67/11 97/68/11
f 79/66/12 80/65/12 81/69/12
f 196/140/13 200/70/13 195/72/13
f 93/66/12 94/65/12 95/69/12
f 81/69/11 82/67/11 83/68/11
f 101/141/14 102/73/14 103/75/14
f 91/62/10 92/61/10 93/66/10
f 83/68/9 84/63/9 85/64/9
f 103/75/15 104/74/15 74/76/15
f 74/76/8 73/60/8 91/62/8
f 85/64/7 86/57/7 87/59/7
f 174/80/16 170/77/16 173/79/16
f 89/75/15 90/74/15 75/76/15
f 87/141/14 88/73/14 89/75/14
f 176/70/17 174/80/17 175/71/17
f 200/70/17 198/80/17 199/71/17
f 131/64/7 132/57/7 133/59/7
f 107/76/8 108/60/8 109/62/8
f 129/68/9 130/63/9 131/64/9
f 109/62/10 110/61/10 111/66/10
f 127/69/11 128/67/11 129/68/11
f 111/66/12 112/65/12 113/69/12
f 198/80/16 194/77/16 197/79/16
f 125/66/12 126/65/12 127/69/12
f 113/69/11 114/67/11 115/68/11
f 133/141/14 134/73/14 135/75/14
f 123/62/10 124/61/10 125/66/10
f 115/68/9 116/63/9 117/64/9
f 135/75/15 136/74/15 106/76/15
f 106/76/8 105/60/8 123/62/8
f 117/64/7 118/57/7 119/59/7
f 172/140/13 176/70/13 171/72/13
f 121/75/15 122/74/15 107/76/15
f 119/141/14 120/73/14 121/75/14
f 170/77/18 172/81/18 169/78/18
f 144/85/2 137/104/2 138/142/2
f 138/142/2 139/143/2 140/83/2
f 140/83/2 141/102/2 142/84/2
f 142/84/2 143/103/2 144/85/2
f 144/85/2 138/142/2 140/83/2
f 78/61/19 76/60/19 137/87/19
f 90/74/20 139/88/20 76/60/20
f 88/73/21 140/90/21 90/74/21
f 86/57/22 141/92/22 88/58/22
f 84/63/23 142/94/23 86/57/23
f 82/67/24 143/96/24 84/63/24
f 80/65/25 144/98/25 82/67/25
f 78/61/26 137/100/26 80/65/26
f 152/85/2 145/104/2 146/142/2
f 146/142/2 147/143/2 148/83/2
f 148/83/2 149/102/2 150/84/2
f 150/84/2 151/103/2 152/85/2
f 152/85/2 146/142/2 148/83/2
f 92/61/19 73/60/19 145/87/19
f 73/60/20 104/74/20 146/89/20
f 102/73/21 148/90/21 104/74/21
f 102/58/22 100/57/22 148/93/22
f 100/57/23 98/63/23 149/95/23
f 96/67/24 151/96/24 98/63/24
f 94/65/25 152/98/25 96/67/25
f 94/65/26 92/61/26 152/101/26
f 160/104/2 153/142/2 154/143/2
f 154/143/2 155/83/2 156/102/2
f 156/102/2 157/84/2 158/103/2
f 158/103/2 159/85/2 160/104/2
f 160/104/2 154/143/2 156/102/2
f 110/61/19 108/60/19 153/87/19
f 122/74/20 155/88/20 108/60/20
f 120/73/21 156/90/21 122/74/21
f 120/58/22 118/57/22 156/93/22
f 116/63/23 158/94/23 118/57/23
f 116/63/24 114/67/24 158/97/24
f 112/65/25 160/98/25 114/67/25
f 110/61/26 153/100/26 112/65/26
f 168/104/2 161/142/2 162/143/2
f 162/143/2 163/83/2 164/102/2
f 164/102/2 165/84/2 166/103/2
f 166/103/2 167/85/2 168/104/2
f 168/104/2 162/143/2 164/102/2
f 105/60/19 162/86/19 124/61/19
f 105/60/20 136/74/20 162/89/20
f 134/73/21 164/90/21 136/74/21
f 134/58/22 132/57/22 164/93/22
f 130/63/23 166/94/23 132/57/23
f 130/63/24 128/67/24 166/97/24
f 126/65/25 168/98/25 128/67/25
f 126/65/26 124/61/26 168/101/26
f 176/144/1 186/105/1 174/107/1
f 180/113/2 179/108/2 177/110/2
f 172/145/18 170/111/18 178/109/18
f 170/146/16 174/112/16 177/110/16
f 176/144/13 172/114/13 179/108/13
f 184/124/2 183/115/2 181/117/2
f 188/130/16 185/118/16 192/120/16
f 176/144/13 179/108/13 186/105/13
f 184/124/16 181/117/16 188/122/16
f 182/116/13 183/115/13 186/105/13
f 183/115/17 184/124/17 187/126/17
f 179/108/2 180/113/2 182/116/2
f 186/133/13 187/127/13 190/129/13
f 187/127/17 188/130/17 191/128/17
f 185/118/18 186/131/18 189/119/18
f 180/113/16 174/112/16 181/117/16
f 194/77/18 196/81/18 193/78/18
f 200/144/1 210/105/1 198/107/1
f 204/113/2 203/108/2 201/110/2
f 196/145/18 194/111/18 202/109/18
f 194/146/16 198/112/16 201/110/16
f 200/144/13 196/114/13 203/108/13
f 208/124/2 207/115/2 205/117/2
f 212/130/16 209/118/16 216/120/16
f 200/144/13 203/108/13 210/105/13
f 208/124/16 205/117/16 212/122/16
f 206/116/13 207/115/13 210/105/13
f 207/115/17 208/124/17 211/126/17
f 203/108/2 204/113/2 206/116/2
f 210/133/13 211/127/13 214/129/13
f 211/127/17 212/130/17 215/128/17
f 209/118/18 210/131/18 213/119/18
f 204/113/16 198/112/16 205/117/16
f 220/140/13 224/70/13 219/72/13
f 224/70/17 222/80/17 223/71/17
f 222/80/16 218/77/16 221/79/16
f 218/77/18 220/81/18 217/78/18
f 224/144/1 234/105/1 222/107/1
f 228/113/2 227/108/2 225/110/2
f 220/145/18 218/111/18 226/109/18
f 218/146/16 222/112/16 225/110/16
f 224/144/13 220/114/13 227/108/13
f 232/124/2 231/115/2 229/117/2
f 236/130/16 233/118/16 240/120/16
f 224/144/13 227/108/13 234/105/13
f 232/124/16 229/117/16 236/122/16
f 230/116/13 231/115/13 234/105/13
f 231/115/17 232/124/17 235/126/17
f 227/108/2 228/113/2 230/116/2
f 234/133/13 235/127/13 238/129/13
f 235/127/17 236/130/17 239/128/17
f 233/118/18 234/131/18 237/119/18
f 228/113/16 222/112/16 229/117/16
f 244/140/13 248/70/13 243/72/13
f 248/70/17 246/80/17 247/71/17
f 246/80/16 242/77/16 245/79/16
f 242/77/18 244/81/18 241/78/18
f 248/144/1 258/105/1 246/107/1
f 252/113/2 251/108/2 249/110/2
f 244/145/18 242/111/18 250/109/18
f 242/146/16 246/112/16 249/110/16
f 248/144/13 244/114/13 251/108/13
f 256/124/2 255/115/2 253/117/2
f 260/120/16 257/128/16 264/130/16
f 248/144/13 251/108/13 258/105/13
f 256/124/16 253/117/16 260/122/16
f 254/116/13 255/115/13 258/105/13
f 255/115/17 256/124/17 259/126/17
f 251/108/2 252/113/2 254/116/2
f 258/132/13 259/119/13 262/131/13
f 259/119/17 260/120/17 263/118/17
f 257/128/18 258/129/18 261/127/18
f 252/113/16 246/112/16 253/117/16

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,183 @@
# Blender v2.76 (sub 0) OBJ File: 'sat_foeq_burning.blend'
# www.blender.org
o Circle
v -0.369146 0.037580 -0.239379
v -0.639379 0.037580 0.030854
v -0.738291 0.037580 0.400000
v -0.639379 0.037580 0.769145
v -0.369146 0.037580 1.039379
v -0.000000 0.037580 1.138291
v 0.369145 0.037580 1.039379
v 0.639379 0.037580 0.769145
v 0.738291 0.037580 0.400000
v 0.639379 0.037580 0.030854
v 0.369146 0.037580 -0.239379
v 0.000000 0.037580 -0.338291
v -1.361453 2.911159 -0.386035
v -0.786035 2.911159 -0.961453
v -1.572070 2.911159 0.400000
v -1.361453 2.911159 1.186035
v -0.786035 2.911159 1.761452
v 0.000000 2.911159 1.972070
v 0.786035 2.911159 1.761452
v 1.361452 2.911159 1.186035
v 1.572070 2.911159 0.400000
v 1.361453 2.911159 -0.386035
v 0.786035 2.911159 -0.961453
v 0.000001 2.911159 -1.172070
v -2.606465 14.941073 -1.104841
v -1.224982 9.420196 -1.721727
v -2.449962 9.420196 0.400001
v -2.606464 14.941073 1.904843
v -1.224982 9.420196 2.521728
v -0.000001 14.941073 3.409685
v 1.224978 9.420196 2.521728
v 2.606461 14.941073 1.904843
v 2.449958 9.420196 0.400001
v 2.606462 14.941073 -1.104841
v 1.224979 9.420196 -1.721727
v -0.000000 14.941073 -2.609684
v -0.388826 -0.174916 0.175511
v -0.224489 -0.174916 0.011174
v -0.448977 -0.174916 0.400000
v -0.388826 -0.174916 0.624488
v -0.224488 -0.174916 0.788825
v -0.000000 -0.174916 0.848977
v 0.224488 -0.174916 0.788825
v 0.388825 -0.174916 0.624488
v 0.448977 -0.174916 0.400000
v 0.388825 -0.174916 0.175511
v 0.224489 -0.174916 0.011174
v 0.000000 -0.174916 -0.048977
vn -0.156700 -0.796000 0.584700
vn -0.936500 -0.116700 0.330700
vn -0.249200 -0.269900 0.930100
vn -0.249200 -0.269900 -0.930100
vn -0.930100 -0.269900 -0.249200
vn 0.930100 -0.269900 -0.249200
vn 0.249200 -0.269900 0.930100
vn -0.930100 -0.269900 0.249200
vn 0.680900 -0.269900 -0.680900
vn 0.680900 -0.269900 0.680900
vn -0.680900 -0.269900 0.680900
vn 0.249200 -0.269900 -0.930100
vn -0.680900 -0.269900 -0.680900
vn 0.930100 -0.269900 0.249200
vn 0.701200 -0.129200 -0.701200
vn 0.754600 -0.116700 0.645700
vn -0.701200 -0.129200 0.701200
vn 0.181900 -0.116700 -0.976400
vn -0.754600 -0.116700 -0.645700
vn 0.957800 -0.129200 0.256700
vn -0.181900 -0.116700 0.976400
vn -0.256600 -0.129200 -0.957800
vn -0.957800 -0.129200 -0.256700
vn 0.936500 -0.116700 -0.330700
vn 0.256700 -0.129200 0.957800
vn 0.000000 -1.000000 0.000000
vn -0.156700 -0.796000 -0.584700
vn -0.584700 -0.796000 -0.156700
vn 0.584700 -0.796000 -0.156700
vn 0.156700 -0.796000 0.584700
vn -0.584700 -0.796000 0.156700
vn 0.428000 -0.796000 -0.428000
vn 0.428000 -0.796000 0.428000
vn -0.428000 -0.796000 0.428000
vn 0.156700 -0.796000 -0.584700
vn -0.428000 -0.796000 -0.428000
vn 0.584700 -0.796000 0.156700
vn -0.957800 -0.129200 0.256700
vn 0.754600 -0.116700 -0.645700
vn 0.701200 -0.129200 0.701200
vn -0.754600 -0.116700 0.645700
vn 0.256700 -0.129200 -0.957800
vn -0.701200 -0.129200 -0.701200
vn 0.936500 -0.116700 0.330700
vn -0.256700 -0.129200 0.957800
vn -0.181900 -0.116700 -0.976400
vn -0.936500 -0.116700 -0.330700
vn 0.957800 -0.129200 -0.256700
vn 0.181900 -0.116700 0.976400
s off
f 5//1 41//1 42//1
f 16//2 28//2 27//2
f 6//3 18//3 17//3
f 1//4 14//4 24//4
f 3//5 15//5 13//5
f 9//6 10//6 22//6
f 7//7 19//7 18//7
f 4//8 16//8 15//8
f 11//9 23//9 22//9
f 8//10 20//10 19//10
f 4//11 5//11 17//11
f 12//12 24//12 23//12
f 2//13 13//13 14//13
f 9//14 21//14 20//14
f 22//15 23//15 35//15
f 20//16 32//16 31//16
f 16//17 17//17 29//17
f 24//18 36//18 35//18
f 13//19 25//19 26//19
f 20//20 21//20 33//20
f 18//21 30//21 29//21
f 24//22 14//22 26//22
f 13//23 15//23 27//23
f 22//24 34//24 33//24
f 18//25 19//25 31//25
f 47//26 41//26 39//26
f 12//27 48//27 38//27
f 2//28 37//28 39//28
f 9//29 45//29 46//29
f 7//30 6//30 42//30
f 3//31 39//31 40//31
f 10//32 46//32 47//32
f 7//33 43//33 44//33
f 5//34 4//34 40//34
f 11//35 47//35 48//35
f 1//36 38//36 37//36
f 9//37 8//37 44//37
f 6//1 5//1 42//1
f 15//38 16//38 27//38
f 5//3 6//3 17//3
f 12//4 1//4 24//4
f 2//5 3//5 13//5
f 21//6 9//6 22//6
f 6//7 7//7 18//7
f 3//8 4//8 15//8
f 10//9 11//9 22//9
f 7//10 8//10 19//10
f 16//11 4//11 17//11
f 11//12 12//12 23//12
f 1//13 2//13 14//13
f 8//14 9//14 20//14
f 34//39 22//39 35//39
f 19//40 20//40 31//40
f 28//41 16//41 29//41
f 23//42 24//42 35//42
f 14//43 13//43 26//43
f 32//44 20//44 33//44
f 17//45 18//45 29//45
f 36//46 24//46 26//46
f 25//47 13//47 27//47
f 21//48 22//48 33//48
f 30//49 18//49 31//49
f 39//26 37//26 47//26
f 38//26 48//26 47//26
f 47//26 46//26 43//26
f 45//26 44//26 43//26
f 43//26 42//26 41//26
f 41//26 40//26 39//26
f 37//26 38//26 47//26
f 46//26 45//26 43//26
f 43//26 41//26 47//26
f 1//27 12//27 38//27
f 3//28 2//28 39//28
f 10//29 9//29 46//29
f 43//30 7//30 42//30
f 4//31 3//31 40//31
f 11//32 10//32 47//32
f 8//33 7//33 44//33
f 41//34 5//34 40//34
f 12//35 11//35 48//35
f 2//36 1//36 37//36
f 45//37 9//37 44//37

View File

@ -36,6 +36,8 @@
"item.geiger6": {"category": "player", "sounds": [{"name": "tool/geiger6", "stream": false}]},
"item.pinUnlock": {"category": "player", "sounds": [{"name": "tool/pinUnlock", "stream": false}]},
"item.pinBreak": {"category": "player", "sounds": [{"name": "tool/pinBreak", "stream": false}]},
"item.gasmaskScrew": {"category": "player", "sounds": [{"name": "tool/gasmaskScrew", "stream": false}]},
"item.jetpackTank": {"category": "player", "sounds": [{"name": "tool/jetpackTank", "stream": false}]},
"music.recordLambdaCore": {"category": "record", "sounds": [{"name": "music/recordLambdaCore", "stream": true}]},
"music.recordSectorSweep": {"category": "record", "sounds": [{"name": "music/recordSectorSweep", "stream": true}]},
@ -116,5 +118,6 @@
"alarm.striderSiren": {"category": "record", "sounds": [{"name": "alarm/striderSiren", "stream": false}]},
"alarm.regularSiren": {"category": "record", "sounds": [{"name": "alarm/regularSiren", "stream": false}]},
"alarm.foKlaxonA": {"category": "record", "sounds": [{"name": "alarm/foKlaxonA", "stream": false}]},
"alarm.foKlaxonB": {"category": "record", "sounds": [{"name": "alarm/foKlaxonB", "stream": false}]}
"alarm.foKlaxonB": {"category": "record", "sounds": [{"name": "alarm/foKlaxonB", "stream": false}]},
"alarm.nostromoSiren": {"category": "record", "sounds": [{"name": "alarm/nostromoSiren", "stream": false}]}
}

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 320 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 228 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 195 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 219 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 229 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 245 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 317 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 238 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 509 B

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 36 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 509 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 871 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 31 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 29 KiB

View File

@ -11,6 +11,7 @@ import com.hbm.blocks.ModBlocks;
import com.hbm.entity.effect.EntityBlackHole;
import com.hbm.entity.effect.EntityCloudFleija;
import com.hbm.entity.effect.EntityCloudFleijaRainbow;
import com.hbm.entity.projectile.EntityBurningFOEQ;
import com.hbm.entity.projectile.EntityMeteor;
import com.hbm.explosion.ExplosionNukeRay;
import com.hbm.explosion.ExplosionNukeRay.FloatTriplet;
@ -285,12 +286,23 @@ public class TestEventTester extends Block {
new Barrel().generate(worldObj, worldObj.rand, par2, par3, par4);*/
worldObj.setBlock(par2, par3, par4, ModBlocks.crate_steel, 0, 3);
/*worldObj.setBlock(par2, par3, par4, ModBlocks.crate_steel, 0, 3);
if(worldObj.getBlock(par2, par3, par4) == ModBlocks.crate_steel)
{
WeightedRandomChestContent.generateChestContents(worldObj.rand, HbmChestContents.getLoot(3), (TileEntityCrateSteel)worldObj.getTileEntity(par2, par3, par4), 32);
}
}*/
EntityBurningFOEQ foeq = new EntityBurningFOEQ(worldObj);
foeq.posX = par2;
foeq.posY = 400;
foeq.posZ = par4;
foeq.motionX = worldObj.rand.nextGaussian() * 1D;
foeq.motionZ = worldObj.rand.nextGaussian() * 1D;
foeq.motionY = -4D;
if(!worldObj.isRemote)
worldObj.spawnEntityInWorld(foeq);
return true;
}

View File

@ -30,7 +30,7 @@ public class EntityGrenadeZOMG extends EntityGrenadeBase
if (!this.worldObj.isRemote)
{
this.setDead();
ExplosionChaos.zomgMeSinPi(this.worldObj, this.posX, this.posY, this.posZ, 100, this.getThrower(), this);
ExplosionChaos.zomgMeSinPi(this.worldObj, this.posX, this.posY, this.posZ, 20, this.getThrower(), this);
}
}

View File

@ -163,14 +163,16 @@ public class EntityBomber extends Entity implements IChunkLoader {
int i = 1;
int rand = world.rand.nextInt(5);
int rand = world.rand.nextInt(7);
switch(rand) {
case 0: i = 1; break;
case 1: i = 2; break;
case 2: i = 5; break;
case 3: i = 6; break;
case 4: i = 7; break;
case 0:
case 1: i = 1; break;
case 2:
case 3: i = 2; break;
case 4: i = 5; break;
case 5: i = 6; break;
case 6: i = 7; break;
}
if(world.rand.nextInt(100) == 0) {
@ -263,6 +265,22 @@ public class EntityBomber extends Entity implements IChunkLoader {
bomber.fac(world, x, y, z);
int i = 1;
int rand = world.rand.nextInt(3);
switch(rand) {
case 0: i = 5; break;
case 1: i = 6; break;
case 2: i = 7; break;
}
if(world.rand.nextInt(100) == 0) {
i = 8;
}
bomber.getDataWatcher().updateObject(16, (byte)i);
bomber.type = 4;
return bomber;

View File

@ -0,0 +1,110 @@
package com.hbm.entity.projectile;
import com.hbm.entity.logic.EntityNukeExplosionMK4;
import com.hbm.entity.missile.EntityBombletSelena;
import com.hbm.entity.particle.EntityDSmokeFX;
import com.hbm.entity.particle.EntitySSmokeFX;
import com.hbm.explosion.ExplosionChaos;
import com.hbm.explosion.ExplosionLarge;
import com.hbm.explosion.ExplosionNukeGeneric;
import com.hbm.explosion.ExplosionParticle;
import com.hbm.explosion.ExplosionParticleB;
import com.hbm.main.MainRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.entity.projectile.EntityThrowable;
import net.minecraft.init.Blocks;
import net.minecraft.util.MathHelper;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.util.Vec3;
import net.minecraft.world.World;
public class EntityBurningFOEQ extends EntityThrowable {
public EntityBurningFOEQ(World p_i1582_1_) {
super(p_i1582_1_);
this.ignoreFrustumCheck = true;
}
@Override
public void onUpdate() {
this.prevPosX = this.posX;
this.prevPosY = this.posY;
this.prevPosZ = this.posZ;
this.posX += this.motionX;
this.posY += this.motionY;
this.posZ += this.motionZ;
if(motionY > -4)
motionY -= 0.1;
this.rotation();
if(this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.air)
{
if(!this.worldObj.isRemote) {
for(int i = 0; i < 25; i++)
ExplosionLarge.explode(worldObj, this.posX + 0.5F + rand.nextGaussian() * 5, this.posY + 0.5F + rand.nextGaussian() * 5, this.posZ + 0.5F + rand.nextGaussian() * 5, 10.0F, rand.nextBoolean(), false, false);
ExplosionNukeGeneric.waste(worldObj, (int)this.posX, (int)this.posY, (int)this.posZ, 35);
}
this.setDead();
}
//if(!this.worldObj.isRemote) {
// Vec3 vec = Vec3.createVectorHelper(motionX, motionY, motionZ);
// vec.normalize();
// worldObj.spawnEntityInWorld(new EntityDSmokeFX(worldObj, posX/* - vec.xCoord * 30*/ + rand.nextGaussian() * 0.5, posY/* - vec.yCoord * 30*/ + rand.nextGaussian() * 0.5, posZ/* - vec.zCoord * 30*/ + rand.nextGaussian() * 0.5, 0, 0, 0));
//}
}
public void rotation() {
float f2 = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ);
this.rotationYaw = (float)(Math.atan2(this.motionX, this.motionZ) * 180.0D / Math.PI);
for (this.rotationPitch = (float)(Math.atan2(this.motionY, f2) * 180.0D / Math.PI) - 90; this.rotationPitch - this.prevRotationPitch < -180.0F; this.prevRotationPitch -= 360.0F)
{
;
}
while (this.rotationPitch - this.prevRotationPitch >= 180.0F)
{
this.prevRotationPitch += 360.0F;
}
while (this.rotationYaw - this.prevRotationYaw < -180.0F)
{
this.prevRotationYaw -= 360.0F;
}
while (this.rotationYaw - this.prevRotationYaw >= 180.0F)
{
this.prevRotationYaw += 360.0F;
}
}
@Override
protected void onImpact(MovingObjectPosition p_70184_1_) {
}
@Override
@SideOnly(Side.CLIENT)
public boolean isInRangeToRenderDist(double distance)
{
return distance < 100000;
}
@Override
@SideOnly(Side.CLIENT)
public int getBrightnessForRender(float p_70070_1_)
{
return 15728880;
}
@Override
public float getBrightness(float p_70013_1_)
{
return 1.0F;
}
}

View File

@ -1194,7 +1194,6 @@ public class ExplosionChaos {
double d1 = 0;
double d2 = 0;
double d3 = 0;
EntityBullet fragment;
// if (shooter != null && shooter instanceof EntityPlayer)
for (int i = 0; i < count; i++) {

View File

@ -526,6 +526,7 @@ public class ModItems {
public static Item plan_c;
public static Item stealth_boy;
public static Item gas_mask_filter;
public static Item jetpack_tank;
public static Item can_empty;
public static Item can_smart;
@ -778,6 +779,7 @@ public class ModItems {
public static Item gun_cryolator_ammo;
public static Item gun_mp;
public static Item gun_mp_ammo;
public static Item gun_brimstone;
public static Item gun_zomg;
public static Item gun_super_shotgun;
public static Item gun_moist_nugget;
@ -1200,7 +1202,10 @@ public class ModItems {
public static Item key;
public static Item key_red;
public static Item pin;
public static Item padlock_rusty;
public static Item padlock;
public static Item padlock_reinforced;
public static Item padlock_unbreakable;
public static Item turret_light_ammo;
public static Item turret_heavy_ammo;
@ -1805,6 +1810,7 @@ public class ModItems {
plan_c = new ItemPill(0).setUnlocalizedName("plan_c").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":plan_c");
stealth_boy = new ItemStarterKit().setUnlocalizedName("stealth_boy").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":stealth_boy");
gas_mask_filter = new ItemSyringe().setUnlocalizedName("gas_mask_filter").setMaxStackSize(1).setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":gas_mask_filter");
jetpack_tank = new ItemSyringe().setUnlocalizedName("jetpack_tank").setMaxStackSize(1).setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":jetpack_tank");
can_empty = new Item().setUnlocalizedName("can_empty").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":can_empty");
can_smart = new ItemEnergy().setUnlocalizedName("can_smart").setContainerItem(ModItems.can_empty).setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":can_smart");
@ -2044,6 +2050,7 @@ public class ModItems {
gun_cryolator = new GunCryolator().setUnlocalizedName("gun_cryolator").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_cryolator");
gun_mp_ammo = new ItemCustomLore().setUnlocalizedName("gun_mp_ammo").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_pm_ammo");
gun_mp = new GunMP().setUnlocalizedName("gun_mp").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_pm");
gun_brimstone = new GunBrimstone().setUnlocalizedName("gun_brimstone").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_brimstone");
gun_zomg = new GunZOMG().setUnlocalizedName("gun_zomg").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_zomg");
gun_revolver_inverted = new GunSuicide().setUnlocalizedName("gun_revolver_inverted").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_revolver_inverted");
gun_emp_ammo = new Item().setUnlocalizedName("gun_emp_ammo").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_emp_ammo");
@ -2323,9 +2330,12 @@ public class ModItems {
survey_scanner = new ItemSurveyScanner().setUnlocalizedName("survey_scanner").setMaxStackSize(1).setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":survey_scanner");
key = new ItemKey().setUnlocalizedName("key").setMaxStackSize(1).setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":key");
key_red = new Item().setUnlocalizedName("key_red").setMaxStackSize(1).setCreativeTab(null).setTextureName(RefStrings.MODID + ":key_red");
key_red = new ItemCustomLore().setUnlocalizedName("key_red").setMaxStackSize(1).setCreativeTab(null).setTextureName(RefStrings.MODID + ":key_red");
pin = new ItemCustomLore().setUnlocalizedName("pin").setMaxStackSize(8).setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":pin");
padlock = new ItemLock().setUnlocalizedName("padlock").setMaxStackSize(1).setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":padlock");
padlock_rusty = new ItemLock(1).setUnlocalizedName("padlock_rusty").setMaxStackSize(1).setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":padlock_rusty");
padlock = new ItemLock(0.1).setUnlocalizedName("padlock").setMaxStackSize(1).setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":padlock");
padlock_reinforced = new ItemLock(0.02).setUnlocalizedName("padlock_reinforced").setMaxStackSize(1).setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":padlock_reinforced");
padlock_unbreakable = new ItemLock(0).setUnlocalizedName("padlock_unbreakable").setMaxStackSize(1).setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":padlock_unbreakable");
turret_light_ammo = new ItemTurretAmmo(ModBlocks.turret_light, 100).setUnlocalizedName("turret_light_ammo").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":turret_light_ammo");
turret_heavy_ammo = new ItemTurretAmmo(ModBlocks.turret_heavy, 25).setUnlocalizedName("turret_heavy_ammo").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":turret_heavy_ammo");
@ -3384,7 +3394,10 @@ public class ModItems {
GameRegistry.registerItem(key, key.getUnlocalizedName());
GameRegistry.registerItem(key_red, key_red.getUnlocalizedName());
GameRegistry.registerItem(pin, pin.getUnlocalizedName());
GameRegistry.registerItem(padlock_rusty, padlock_rusty.getUnlocalizedName());
GameRegistry.registerItem(padlock, padlock.getUnlocalizedName());
GameRegistry.registerItem(padlock_reinforced, padlock_reinforced.getUnlocalizedName());
GameRegistry.registerItem(padlock_unbreakable, padlock_unbreakable.getUnlocalizedName());
//Missiles
GameRegistry.registerItem(missile_generic, missile_generic.getUnlocalizedName());
@ -3458,6 +3471,7 @@ public class ModItems {
GameRegistry.registerItem(gun_immolator, gun_immolator.getUnlocalizedName());
GameRegistry.registerItem(gun_cryolator, gun_cryolator.getUnlocalizedName());
GameRegistry.registerItem(gun_mp, gun_mp.getUnlocalizedName());
GameRegistry.registerItem(gun_brimstone, gun_brimstone.getUnlocalizedName());
GameRegistry.registerItem(gun_zomg, gun_zomg.getUnlocalizedName());
GameRegistry.registerItem(gun_emp, gun_emp.getUnlocalizedName());
GameRegistry.registerItem(gun_revolver_inverted, gun_revolver_inverted.getUnlocalizedName());
@ -3673,6 +3687,7 @@ public class ModItems {
GameRegistry.registerItem(plan_c, plan_c.getUnlocalizedName());
GameRegistry.registerItem(stealth_boy, stealth_boy.getUnlocalizedName());
GameRegistry.registerItem(gas_mask_filter, gas_mask_filter.getUnlocalizedName());
GameRegistry.registerItem(jetpack_tank, jetpack_tank.getUnlocalizedName());
//Food
GameRegistry.registerItem(bomb_waffle, bomb_waffle.getUnlocalizedName());

View File

@ -89,7 +89,7 @@ public class ItemCanteen extends Item {
//list.add("Why sipp when you can succ?");
list.add("Time to get hammered & sickled!");
else
list.add("Smells like desinfectant, tastes like desinfectant.");
list.add("Smells like disinfectant, tastes like disinfectant.");
}
}

View File

@ -7,6 +7,7 @@ import org.lwjgl.opengl.GL11;
import com.hbm.items.ModItems;
import com.hbm.lib.Library;
import com.hbm.lib.RefStrings;
import com.hbm.main.MainRegistry;
import com.hbm.render.model.ModelCloak;
import com.hbm.render.model.ModelGasMask;
import com.hbm.render.model.ModelGoggles;
@ -176,7 +177,10 @@ public class ArmorModel extends ItemArmor {
return "hbm:textures/models/CapeSchrabidium.png";
}
if (stack.getItem() == ModItems.cape_hbm && entity instanceof EntityPlayer && ((EntityPlayer)entity).getUniqueID().toString().equals(Library.HbMinecraft)) {
return "hbm:textures/models/CapeHbm.png";
if(MainRegistry.polaroidID == 11)
return "hbm:textures/models/CapeHbm.png";
else
return "hbm:textures/models/CapeHbm2.png";
}
if (stack.getItem() == ModItems.cape_dafnik && entity instanceof EntityPlayer && ((EntityPlayer)entity).getUniqueID().toString().equals(Library.Dafnik)) {
return "hbm:textures/models/CapeDafnik.png";

View File

@ -73,12 +73,15 @@ public class JetpackBooster extends ItemArmor {
player.motionY += 0.15;
this.setBoost(stack, this.getBoost(stack) - 1);
EntityGasFlameFX fx = new EntityGasFlameFX(world);
fx.posX = player.posX - vec.xCoord;
fx.posY = player.posY - 1;
fx.posZ = player.posZ - vec.zCoord;
fx.motionY = -0.1;
world.spawnEntityInWorld(fx);
if(!world.isRemote) {
EntityGasFlameFX fx = new EntityGasFlameFX(world);
fx.posX = player.posX - vec.xCoord;
fx.posY = player.posY - 1;
fx.posZ = player.posZ - vec.zCoord;
fx.motionY = -0.1;
world.spawnEntityInWorld(fx);
}
this.setFuel(stack, this.getFuel(stack) - 1);

View File

@ -65,12 +65,14 @@ public class JetpackBreak extends ItemArmor {
vec.normalize();
player.motionY = -0.25;
EntityGasFlameFX fx = new EntityGasFlameFX(world);
fx.posX = player.posX - vec.xCoord;
fx.posY = player.posY - 1;
fx.posZ = player.posZ - vec.zCoord;
fx.motionY = -0.5;
world.spawnEntityInWorld(fx);
if(!world.isRemote) {
EntityGasFlameFX fx = new EntityGasFlameFX(world);
fx.posX = player.posX - vec.xCoord;
fx.posY = player.posY - 1;
fx.posZ = player.posZ - vec.zCoord;
fx.motionY = -0.5;
world.spawnEntityInWorld(fx);
}
player.fallDistance = 0;

View File

@ -67,12 +67,14 @@ public class JetpackRegular extends ItemArmor {
vec.normalize();
player.motionY += 0.15;
EntityGasFlameFX fx = new EntityGasFlameFX(world);
fx.posX = player.posX - vec.xCoord;
fx.posY = player.posY - 1;
fx.posZ = player.posZ - vec.zCoord;
fx.motionY = -0.15;
world.spawnEntityInWorld(fx);
if(!world.isRemote) {
EntityGasFlameFX fx = new EntityGasFlameFX(world);
fx.posX = player.posX - vec.xCoord;
fx.posY = player.posY - 1;
fx.posZ = player.posZ - vec.zCoord;
fx.motionY = -0.15;
world.spawnEntityInWorld(fx);
}
player.fallDistance = 0;

View File

@ -68,14 +68,16 @@ public class JetpackVectorized extends ItemArmor {
player.motionY += 0.15;
player.motionZ += vec.zCoord * 0.2;
EntityGasFlameFX fx = new EntityGasFlameFX(world);
fx.posX = player.posX - vec.xCoord;
fx.posY = player.posY - 1;
fx.posZ = player.posZ - vec.zCoord;
fx.motionX -= vec.xCoord * 0.2;
fx.motionY -= vec.yCoord * 0.2;
fx.motionZ -= vec.zCoord * 0.2;
world.spawnEntityInWorld(fx);
if(!world.isRemote) {
EntityGasFlameFX fx = new EntityGasFlameFX(world);
fx.posX = player.posX - vec.xCoord;
fx.posY = player.posY - 1;
fx.posZ = player.posZ - vec.zCoord;
fx.motionX -= vec.xCoord * 0.2;
fx.motionY -= vec.yCoord * 0.2;
fx.motionZ -= vec.zCoord * 0.2;
world.spawnEntityInWorld(fx);
}
player.fallDistance = 0;

View File

@ -11,6 +11,7 @@ import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.EnumRarity;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumChatFormatting;
public class ItemCustomLore extends ItemRadioactive {
@ -643,9 +644,31 @@ public class ItemCustomLore extends ItemRadioactive {
list.add("Can be used with a screwdriver to pick locks.");
if(Library.checkArmorPiece(player, ModItems.jackt, 2) || Library.checkArmorPiece(player, ModItems.jackt2, 2))
list.add("Success rate of lockpicking is 100%!");
list.add("Success rate of picking standard lock is 100%!");
else
list.add("Success rate of lockpicking is ~10%");
list.add("Success rate of picking standard lock is ~10%");
}
if(this == ModItems.key_red)
{
if(MainRegistry.polaroidID == 11) {
list.add("ard lock is ~10%5Success ra");
list.add("Antimatter +15");
list.add("ced resource scanner.27Production x4 / Co");
list.add("this == ModItems.watch || this == ModI");
list.add("list.add(\"Woo, scary!\");");
list.add(EnumChatFormatting.OBFUSCATED + "//list.add(\"Blue horse beats yellow horse, look it up!\");");
list.add("ion -60 / Delay +1019All hail");
list.add("bank angle bank angle bank angle");
list.add("'M");
list.add("");
list.add("bank angle bank angle bank angle");
list.add("bank angle bank angle bank angle");
list.add("");
list.add(EnumChatFormatting.DARK_RED + "" + EnumChatFormatting.BOLD + "e");
} else {
list.add("Explore the other side.");
}
}
}

View File

@ -4,6 +4,10 @@ import java.util.List;
import java.util.Random;
import com.hbm.items.ModItems;
import com.hbm.items.gear.JetpackBooster;
import com.hbm.items.gear.JetpackBreak;
import com.hbm.items.gear.JetpackRegular;
import com.hbm.items.gear.JetpackVectorized;
import com.hbm.lib.ModDamageSource;
import com.hbm.potion.HbmPotion;
@ -235,8 +239,40 @@ public class ItemSyringe extends Item {
{
if (!world.isRemote)
{
if(player.inventory.armorInventory[3].getItemDamage() == 0)
return stack;
player.inventory.armorInventory[3].setItemDamage(0);
world.playSoundAtEntity(player, "hbm:item.gasmaskScrew", 1.0F, 1.0F);
stack.stackSize--;
}
}
if(this == ModItems.jetpack_tank && player.inventory.armorInventory[2] != null &&
(player.inventory.armorInventory[2].getItem() == ModItems.jetpack_boost || player.inventory.armorInventory[2].getItem() == ModItems.jetpack_break ||
player.inventory.armorInventory[2].getItem() == ModItems.jetpack_fly || player.inventory.armorInventory[2].getItem() == ModItems.jetpack_vector))
{
if (!world.isRemote)
{
ItemStack jetpack = player.inventory.armorInventory[2];
int fill = JetpackRegular.getFuel(jetpack) + 1000;
if(jetpack.getItem() == ModItems.jetpack_boost && fill > JetpackBooster.maxFuel)
fill = JetpackBooster.maxFuel;
if(jetpack.getItem() == ModItems.jetpack_break && fill > JetpackBreak.maxFuel)
fill = JetpackBreak.maxFuel;
if(jetpack.getItem() == ModItems.jetpack_fly && fill > JetpackRegular.maxFuel)
fill = JetpackRegular.maxFuel;
if(jetpack.getItem() == ModItems.jetpack_vector && fill > JetpackVectorized.maxFuel)
fill = JetpackVectorized.maxFuel;
if(JetpackRegular.getFuel(jetpack) == fill)
return stack;
JetpackRegular.setFuel(jetpack, fill);
world.playSoundAtEntity(player, "hbm:item.jetpackTank", 1.0F, 1.0F);
stack.stackSize--;
}
}
@ -498,5 +534,8 @@ public class ItemSyringe extends Item {
if(this == ModItems.gas_mask_filter) {
list.add("Repairs worn gasmask");
}
if(this == ModItems.jetpack_tank) {
list.add("Fills worn jetpack with up to 1000mB of kerosene");
}
}
}

View File

@ -39,6 +39,7 @@ public class ItemCassette extends Item {
CONTAINER_ALARM( "Container Alarm", new ResourceLocation("hbm:alarm.containerAlarm"), SoundType.LOOP, 14727839, 100),
SWEEP_SIREN( "Sweep Siren", new ResourceLocation("hbm:alarm.sweepSiren"), SoundType.LOOP, 15592026, 500),
STRIDER_SIREN( "Missile Silo Siren", new ResourceLocation("hbm:alarm.striderSiren"), SoundType.LOOP, 11250586, 500),
NOSTROMO_SIREN( "Nostromo Self Destruct", new ResourceLocation("hbm:alarm.nostromoSiren"), SoundType.LOOP, 0x5dd800, 100),
APC_PASS( "APC Pass", new ResourceLocation("hbm:alarm.apcPass"), SoundType.PASS, 3422163, 50),
RAZORTRAIN( "Razortrain Horn", new ResourceLocation("hbm:alarm.razortrainHorn"), SoundType.SOUND, 7819501, 250);

View File

@ -1,5 +1,7 @@
package com.hbm.items.tool;
import java.util.List;
import com.hbm.blocks.bomb.TurretBase;
import com.hbm.tileentity.machine.TileEntityDummy;
import com.hbm.tileentity.machine.TileEntityLockableBase;
@ -13,6 +15,12 @@ import net.minecraft.world.World;
public class ItemLock extends ItemKeyPin {
public double lockMod = 0.1D;
public ItemLock(double mod) {
lockMod = mod;
}
@Override
public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int i, float f0, float f1, float f2)
{
@ -27,6 +35,7 @@ public class ItemLock extends ItemKeyPin {
tile.setPins(this.getPins(stack));
tile.lock();
tile.setMod(lockMod);
world.playSoundAtEntity(player, "hbm:block.lockHang", 1.0F, 1.0F);
stack.stackSize--;
@ -47,6 +56,7 @@ public class ItemLock extends ItemKeyPin {
tile.setPins(this.getPins(stack));
tile.lock();
tile.setMod(lockMod);
world.playSoundAtEntity(player, "hbm:block.lockHang", 1.0F, 1.0F);
stack.stackSize--;

View File

@ -0,0 +1,7 @@
package com.hbm.items.weapon;
import net.minecraft.item.Item;
public class GunBrimstone extends Item {
}

View File

@ -239,6 +239,8 @@ public class ClientProxy extends ServerProxy
MinecraftForgeClient.registerItemRenderer(ModItems.shimmer_sledge, new ItemRenderShim());
MinecraftForgeClient.registerItemRenderer(ModItems.shimmer_axe, new ItemRenderShim());
MinecraftForgeClient.registerItemRenderer(ModItems.gun_brimstone, new ItemRenderObj());
RenderingRegistry.registerEntityRenderingHandler(EntityBullet.class, new RenderRocket());
RenderingRegistry.registerEntityRenderingHandler(EntityMiniNuke.class, new RenderMiniNuke());
RenderingRegistry.registerEntityRenderingHandler(EntityMiniMIRV.class, new RenderMiniMIRV());
@ -309,6 +311,7 @@ public class ClientProxy extends ServerProxy
RenderingRegistry.registerEntityRenderingHandler(EntityCarrier.class, new RenderCarrierMissile());
RenderingRegistry.registerEntityRenderingHandler(EntityBooster.class, new RenderBoosterMissile());
RenderingRegistry.registerEntityRenderingHandler(EntityBomber.class, new RenderBomber());
RenderingRegistry.registerEntityRenderingHandler(EntityBurningFOEQ.class, new RenderFOEQ());
RenderingRegistry.registerEntityRenderingHandler(EntityMissileTaint.class, new RenderMissileTaint());
RenderingRegistry.registerEntityRenderingHandler(EntityMissileMicro.class, new RenderMissileTaint());

View File

@ -132,6 +132,9 @@ public class CraftingManager {
GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.block_meteor_broken), 1), new Object[] { "###", "###", "###", '#', ModItems.fragment_meteorite });
GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.block_yellowcake), 1), new Object[] { "###", "###", "###", '#', ModItems.powder_yellowcake });
GameRegistry.addRecipe(new ItemStack(ModBlocks.hazmat, 8), new Object[] { "###", "# #", "###", '#', ModItems.hazmat_cloth });
GameRegistry.addRecipe(new ItemStack(ModItems.hazmat_cloth, 1), new Object[] { "#", '#', ModBlocks.hazmat });
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.ingot_uranium_fuel, 1), new Object[] { "nuggetUranium235", "nuggetUranium235", "nuggetUranium235", "nuggetUranium238", "nuggetUranium238", "nuggetUranium238", "nuggetUranium238", "nuggetUranium238", "nuggetUranium238" }));
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.ingot_plutonium_fuel, 1), new Object[] { "nuggetPlutonium238", "nuggetPlutonium239", "nuggetPlutonium239", "nuggetPlutonium239", "nuggetPlutonium239", "nuggetPlutonium239", "nuggetPlutonium240", "nuggetPlutonium240", "nuggetPlutonium240" }));
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.ingot_mox_fuel, 1), new Object[] { "nuggetUranium235", "nuggetUranium235", "nuggetUranium235", "nuggetUranium238", "nuggetUranium238", "nuggetPlutonium238", "nuggetPlutonium239", "nuggetPlutonium239", "nuggetPlutonium239" }));
@ -1095,6 +1098,7 @@ public class CraftingManager {
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gas_mask, 1), new Object[] { "PPP", "GPG", " F ", 'G', "paneGlass", 'P', "plateSteel", 'F', ModItems.gas_mask_filter }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gas_mask_m65, 1), new Object[] { "PPP", "GPG", " F ", 'G', "paneGlass", 'P', ModItems.plate_polymer, 'F', ModItems.gas_mask_filter }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gas_mask_filter, 1), new Object[] { "F", "I", "F", 'F', ModItems.filter_coal, 'I', "plateIron" }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.jetpack_tank, 1), new Object[] { " S ", "BKB", " S ", 'S', "plateSteel", 'B', ModItems.bolt_tungsten, 'K', ModItems.canister_kerosene }));
GameRegistry.addRecipe(new ItemStack(ModItems.cape_radiation, 1), new Object[] { "W W", "WIW", "WDW", 'W', new ItemStack(Item.getItemFromBlock(Blocks.wool), 1, 11), 'D', new ItemStack(Items.dye, 1, 11), 'I', ModItems.nuclear_waste });
GameRegistry.addRecipe(new ItemStack(ModItems.cape_gasmask, 1), new Object[] { "W W", "WIW", "WDW", 'W', new ItemStack(Item.getItemFromBlock(Blocks.wool), 1, 4), 'D', new ItemStack(Items.dye, 1, 0), 'I', ModItems.gas_mask });
@ -1126,9 +1130,12 @@ public class CraftingManager {
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.geiger_counter, 1), new Object[] { "GPP", "WCS", "WBB", 'W', ModItems.wire_gold, 'P', ModItems.ingot_polymer, 'C', ModItems.circuit_copper, 'G', "ingotGold", 'S', "plateSteel", 'B', ModItems.ingot_beryllium }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.key, 1), new Object[] { " B", " B ", "P ", 'P', "plateSteel", 'B', ModItems.bolt_tungsten }));
GameRegistry.addRecipe(new ItemStack(ModItems.key_red, 1), new Object[] { " C", " M ", "K ", 'C', ModItems.circuit_targeting_tier4, 'M', ModItems.motor, 'K', ModItems.key });
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.key_red, 1), new Object[] { "DSC", "SMS", "KSD", 'C', ModItems.circuit_targeting_tier4, 'M', Items.nether_star, 'K', ModItems.key, 'D', "dustDesh", 'S', "plateSaturnite" }));
GameRegistry.addRecipe(new ItemStack(ModItems.pin, 1), new Object[] { "W ", " W", " W", 'W', ModItems.wire_copper });
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.padlock_rusty, 1), new Object[] { "I", "B", "I", 'I', "ingotIron", 'B', ModItems.bolt_tungsten }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.padlock, 1), new Object[] { " P ", "PBP", "PPP", 'P', "plateSteel", 'B', ModItems.bolt_tungsten }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.padlock_reinforced, 1), new Object[] { " P ", "PBP", "PDP", 'P', "plateAdvanced", 'D', "plateDesh", 'B', ModItems.bolt_dura_steel }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.padlock_unbreakable, 1), new Object[] { " P ", "PBP", "PDP", 'P', "plateSaturnite", 'D', "gemDiamond", 'B', ModItems.bolt_dura_steel }));
//GameRegistry.addRecipe(new ItemStack(ModItems.schrabidium_hammer, 1), new Object[] { "BBB", "BBB", " S ", 'B', Item.getItemFromBlock(ModBlocks.block_schrabidium), 'S', Items.stick });
GameRegistry.addRecipe(new ItemStack(ModItems.euphemium_stopper, 1), new Object[] { "I", "S", "S", 'I', ModItems.ingot_euphemium, 'S', Items.stick });

View File

@ -152,6 +152,7 @@ import com.hbm.entity.projectile.EntityBaleflare;
import com.hbm.entity.projectile.EntityBombletZeta;
import com.hbm.entity.projectile.EntityBoxcar;
import com.hbm.entity.projectile.EntityBullet;
import com.hbm.entity.projectile.EntityBurningFOEQ;
import com.hbm.entity.projectile.EntityChopperMine;
import com.hbm.entity.projectile.EntityCombineBall;
import com.hbm.entity.projectile.EntityDischarge;
@ -818,6 +819,7 @@ public class MainRegistry
EntityRegistry.registerModEntity(EntityGrenadeMIRV.class, "entity_grenade_mirv", 113, this, 250, 1, true);
EntityRegistry.registerModEntity(EntityGrenadeBreach.class, "entity_grenade_breach", 114, this, 250, 1, true);
EntityRegistry.registerModEntity(EntityGrenadeBurst.class, "entity_grenade_burst", 115, this, 250, 1, true);
EntityRegistry.registerModEntity(EntityBurningFOEQ.class, "entity_burning_foeq", 116, this, 1000, 1, true);
EntityRegistry.registerGlobalEntityID(EntityNuclearCreeper.class, "entity_mob_nuclear_creeper", EntityRegistry.findGlobalUniqueEntityId(), 0x204131, 0x75CE00);
EntityRegistry.registerGlobalEntityID(EntityTaintedCreeper.class, "entity_mob_tainted_creeper", EntityRegistry.findGlobalUniqueEntityId(), 0x813b9b, 0xd71fdd);

View File

@ -57,6 +57,12 @@ public class ResourceManager {
public static final IModelCustom press_body = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/press_body.obj"));
public static final IModelCustom press_head = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/press_head.obj"));
//Chemplant
public static final IModelCustom chemplant_new = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/chemplant_main_new.obj"));
//Centrifuge
public static final IModelCustom centrifuge_new = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/centrifuge_new.obj"));
//Anti Mass Spectrometer
public static final IModelCustom ams_base = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/ams_base.obj"));
public static final IModelCustom ams_emitter = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/ams_emitter.obj"));
@ -106,6 +112,8 @@ public class ResourceManager {
public static final IModelCustom sat_mapper = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/sat_mapper.obj"));
public static final IModelCustom sat_laser = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/sat_laser.obj"));
public static final IModelCustom sat_foeq = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/sat_foeq.obj"));
public static final IModelCustom sat_foeq_burning = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/sat_foeq_burning.obj"));
public static final IModelCustom sat_foeq_fire = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/sat_foeq_fire.obj"));
//Vault Door
public static final IModelCustom vault_cog = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/vault_cog.obj"));
@ -168,6 +176,12 @@ public class ResourceManager {
public static final ResourceLocation press_body_tex = new ResourceLocation(RefStrings.MODID, "textures/models/press_body.png");
public static final ResourceLocation press_head_tex = new ResourceLocation(RefStrings.MODID, "textures/models/press_head.png");
//Chemplant
public static final ResourceLocation chemplant_new_tex = new ResourceLocation(RefStrings.MODID, "textures/models/chemplant_main_new.png");
//Centrifuge
public static final ResourceLocation centrifuge_new_tex = new ResourceLocation(RefStrings.MODID, "textures/models/centrifuge_new.png");
//Anti Mass Spectrometer
public static final ResourceLocation ams_base_tex = new ResourceLocation(RefStrings.MODID, "textures/models/ams_base.png");
public static final ResourceLocation ams_emitter_tex = new ResourceLocation(RefStrings.MODID, "textures/models/ams_emitter.png");
@ -202,6 +216,7 @@ public class ResourceManager {
public static final ResourceLocation sat_mapper_tex = new ResourceLocation(RefStrings.MODID, "textures/models/sat_mapper.png");
public static final ResourceLocation sat_laser_tex = new ResourceLocation(RefStrings.MODID, "textures/models/sat_laser.png");
public static final ResourceLocation sat_foeq_tex = new ResourceLocation(RefStrings.MODID, "textures/models/sat_foeq.png");
public static final ResourceLocation sat_foeq_burning_tex = new ResourceLocation(RefStrings.MODID, "textures/models/sat_foeq_burning.png");
//Vault Door
public static final ResourceLocation vault_cog_tex = new ResourceLocation(RefStrings.MODID, "textures/models/vault_cog.png");
@ -229,12 +244,16 @@ public class ResourceManager {
public static final IModelCustom shimmer_sledge = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/shimmer_sledge.obj"));
public static final IModelCustom shimmer_axe = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/shimmer_axe.obj"));
public static final IModelCustom brimstone = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/brimstone.obj"));
////Texture Items
//Shimmer Sledge
public static final ResourceLocation shimmer_sledge_tex = new ResourceLocation(RefStrings.MODID, "textures/models/shimmer_sledge.png");
public static final ResourceLocation shimmer_axe_tex = new ResourceLocation(RefStrings.MODID, "textures/models/shimmer_axe.png");
public static final ResourceLocation brimstone_tex = new ResourceLocation(RefStrings.MODID, "textures/models/brimstone.png");
////Obj Entities

View File

@ -0,0 +1,74 @@
package com.hbm.render.entity;
import java.util.Random;
import org.lwjgl.opengl.GL11;
import com.hbm.main.ResourceManager;
import net.minecraft.client.renderer.entity.Render;
import net.minecraft.entity.Entity;
import net.minecraft.util.ResourceLocation;
public class RenderFOEQ extends Render {
public RenderFOEQ() { }
@Override
public void doRender(Entity p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_) {
GL11.glPushMatrix();
GL11.glTranslatef((float)p_76986_2_, (float)p_76986_4_ - 75, (float)p_76986_6_);
GL11.glRotatef(p_76986_1_.prevRotationYaw + (p_76986_1_.rotationYaw - p_76986_1_.prevRotationYaw) * p_76986_9_ - 90.0F, 0.0F, 1.0F, 0.0F);
GL11.glRotatef(180, 0F, 0F, 1F);
GL11.glRotatef(p_76986_1_.prevRotationPitch + (p_76986_1_.rotationPitch - p_76986_1_.prevRotationPitch) * p_76986_9_, 0.0F, 0.0F, 1.0F);
GL11.glEnable(GL11.GL_LIGHTING);
//GL11.glScaled(5, 5, 5);
GL11.glEnable(GL11.GL_CULL_FACE);
bindTexture(ResourceManager.sat_foeq_burning_tex);
ResourceManager.sat_foeq_burning.renderAll();
GL11.glDisable(GL11.GL_TEXTURE_2D);
GL11.glDisable(GL11.GL_CULL_FACE);
GL11.glEnable(GL11.GL_BLEND);
Random rand = new Random(System.currentTimeMillis() / 50);
GL11.glScaled(1.15, 0.75, 1.15);
GL11.glTranslated(0, -0.5, 0.3);
GL11.glDisable(GL11.GL_CULL_FACE);
for(int i = 0; i < 10; i++) {
GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE);
GL11.glColor3d(1, 0.75, 0.25);
GL11.glRotatef(rand.nextInt(360), 0F, 1F, 0F);
ResourceManager.sat_foeq_fire.renderAll();
GL11.glTranslated(0, 2, 0);
GL11.glColor3d(1, 0.5, 0);
GL11.glRotatef(rand.nextInt(360), 0F, 1F, 0F);
ResourceManager.sat_foeq_fire.renderAll();
GL11.glTranslated(0, 2, 0);
GL11.glColor3d(1, 0.25, 0);
GL11.glRotatef(rand.nextInt(360), 0F, 1F, 0F);
ResourceManager.sat_foeq_fire.renderAll();
GL11.glTranslated(0, 2, 0);
GL11.glColor3d(1, 0.15, 0);
GL11.glRotatef(rand.nextInt(360), 0F, 1F, 0F);
ResourceManager.sat_foeq_fire.renderAll();
GL11.glTranslated(0, -3.8, 0);
GL11.glScaled(0.95, 1.2, 0.95);
}
GL11.glDisable(GL11.GL_BLEND);
GL11.glEnable(GL11.GL_TEXTURE_2D);
GL11.glPopMatrix();
}
@Override
protected ResourceLocation getEntityTexture(Entity p_110775_1_) {
return ResourceManager.sat_foeq_tex;
}
}

View File

@ -0,0 +1,59 @@
package com.hbm.render.item;
import org.lwjgl.opengl.GL11;
import com.hbm.items.ModItems;
import com.hbm.main.ResourceManager;
import net.minecraft.client.Minecraft;
import net.minecraft.item.ItemStack;
import net.minecraftforge.client.IItemRenderer;
import net.minecraftforge.client.IItemRenderer.ItemRenderType;
import net.minecraftforge.client.IItemRenderer.ItemRendererHelper;
public class ItemRenderObj implements IItemRenderer {
public ItemRenderObj() { }
@Override
public boolean handleRenderType(ItemStack item, ItemRenderType type) {
switch(type) {
case EQUIPPED:
case EQUIPPED_FIRST_PERSON:
case ENTITY:
return true;
default: return false;
}
}
@Override
public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) {
return false;
}
@Override
public void renderItem(ItemRenderType type, ItemStack item, Object... data) {
switch(type) {
case EQUIPPED_FIRST_PERSON:
GL11.glRotatef(70F, 0.0F, 1.0F, 0.0F);
GL11.glRotatef(-50F, 1.0F, 0.0F, 0.0F);
GL11.glTranslatef(-0.6F, -0.9F, 0.2F);
case EQUIPPED:
case ENTITY:
default:
GL11.glPushMatrix();
if(item.getItem() == ModItems.gun_brimstone)
Minecraft.getMinecraft().renderEngine.bindTexture(ResourceManager.brimstone_tex);
//GL11.glRotatef(-135.0F, 0.0F, 0.0F, 1.0F);
GL11.glRotatef(10F, 1.0F, 0.0F, 0.0F);
GL11.glRotatef(190F, 0.0F, 1.0F, 0.0F);
GL11.glRotatef(-15F, 0.0F, 0.0F, 1.0F);
GL11.glScalef(0.75F, 0.75F, 0.75F);
GL11.glTranslatef(-0.7F, -0.4F, -1.1F);
GL11.glDisable(GL11.GL_CULL_FACE);
if(item.getItem() == ModItems.gun_brimstone)
ResourceManager.brimstone.renderAll();
GL11.glPopMatrix(); break;
}
}
}

View File

@ -3,6 +3,7 @@ package com.hbm.render.tileentity;
import org.lwjgl.opengl.GL11;
import com.hbm.lib.RefStrings;
import com.hbm.main.ResourceManager;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
import net.minecraft.tileentity.TileEntity;
@ -12,15 +13,7 @@ import net.minecraftforge.client.model.IModelCustom;
public class RenderCentrifuge extends TileEntitySpecialRenderer {
private static final ResourceLocation centrifugeModel = new ResourceLocation(/*"/assets/" + */RefStrings.MODID, "models/centrifuge.obj");
private IModelCustom centrifugeModelC;
private ResourceLocation centrifugeTexture;
public RenderCentrifuge()
{
centrifugeModelC = AdvancedModelLoader.loadModel(centrifugeModel);
centrifugeTexture = new ResourceLocation(RefStrings.MODID, "textures/models/centrifuge.png");
}
public RenderCentrifuge() { }
@Override
public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float f)
@ -40,8 +33,8 @@ public class RenderCentrifuge extends TileEntitySpecialRenderer {
GL11.glRotatef(0, 0F, 1F, 0F); break;
}
bindTexture(centrifugeTexture);
centrifugeModelC.renderAll();
bindTexture(ResourceManager.centrifuge_new_tex);
ResourceManager.centrifuge_new.renderAll();
GL11.glPopMatrix();
}

View File

@ -3,6 +3,7 @@ package com.hbm.render.tileentity;
import org.lwjgl.opengl.GL11;
import com.hbm.lib.RefStrings;
import com.hbm.main.ResourceManager;
import com.hbm.tileentity.machine.TileEntityMachineChemplant;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
@ -53,9 +54,9 @@ public class RenderChemplant extends TileEntitySpecialRenderer {
GL11.glTranslated(0.5D, 0.0D, -0.5D); break;
}
bindTexture(bodyTexture);
bindTexture(ResourceManager.chemplant_new_tex);
bodyModel.renderAll();
ResourceManager.chemplant_new.renderAll();
GL11.glPopMatrix();

View File

@ -1,5 +1,7 @@
package com.hbm.render.tileentity;
import java.util.Random;
import org.lwjgl.opengl.GL11;
import com.hbm.lib.RefStrings;
@ -32,7 +34,7 @@ public class RendererObjTester extends TileEntitySpecialRenderer {
GL11.glPushMatrix();
GL11.glTranslated(x + 0.5D, y, z + 0.5D);
//GL11.glRotatef(180, 0F, 0F, 1F);
switch(tileEntity.getBlockMetadata())
/*switch(tileEntity.getBlockMetadata())
{
case 5:
GL11.glRotatef(90, 0F, 1F, 0F); break;
@ -42,16 +44,51 @@ public class RendererObjTester extends TileEntitySpecialRenderer {
GL11.glRotatef(270, 0F, 1F, 0F); break;
case 2:
GL11.glRotatef(0, 0F, 1F, 0F); break;
}
}*/
/*bindTexture(objTesterTexture);
objTesterModel.renderAll();*/
GL11.glEnable(GL11.GL_LIGHTING);
GL11.glScaled(5, 5, 5);
//GL11.glScaled(5, 5, 5);
GL11.glEnable(GL11.GL_CULL_FACE);
bindTexture(ResourceManager.sat_foeq_burning_tex);
ResourceManager.sat_foeq_burning.renderAll();
GL11.glDisable(GL11.GL_TEXTURE_2D);
GL11.glDisable(GL11.GL_CULL_FACE);
GL11.glEnable(GL11.GL_BLEND);
Random rand = new Random(System.currentTimeMillis() / 50);
GL11.glScaled(1.15, 0.75, 1.15);
GL11.glTranslated(0, -0.5, 0.3);
GL11.glDisable(GL11.GL_CULL_FACE);
bindTexture(ResourceManager.dornier_2_tex);
ResourceManager.dornier.renderAll();
for(int i = 0; i < 10; i++) {
GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE);
GL11.glColor3d(1, 0.75, 0.25);
GL11.glRotatef(rand.nextInt(360), 0F, 1F, 0F);
ResourceManager.sat_foeq_fire.renderAll();
GL11.glTranslated(0, 2, 0);
GL11.glColor3d(1, 0.5, 0);
GL11.glRotatef(rand.nextInt(360), 0F, 1F, 0F);
ResourceManager.sat_foeq_fire.renderAll();
GL11.glTranslated(0, 2, 0);
GL11.glColor3d(1, 0.25, 0);
GL11.glRotatef(rand.nextInt(360), 0F, 1F, 0F);
ResourceManager.sat_foeq_fire.renderAll();
GL11.glTranslated(0, 2, 0);
GL11.glColor3d(1, 0.0, 0);
GL11.glRotatef(rand.nextInt(360), 0F, 1F, 0F);
ResourceManager.sat_foeq_fire.renderAll();
GL11.glTranslated(0, -3.8, 0);
GL11.glScaled(0.95, 1.2, 0.95);
}
GL11.glDisable(GL11.GL_BLEND);
GL11.glEnable(GL11.GL_TEXTURE_2D);
GL11.glPopMatrix();
}

View File

@ -4,6 +4,7 @@ import java.util.ArrayList;
import java.util.List;
import com.hbm.blocks.bomb.TurretBase;
import com.hbm.entity.logic.EntityBomber;
import com.hbm.entity.missile.EntityMissileBaseAdvanced;
import com.hbm.items.tool.ItemTurretBiometry;
import com.hbm.lib.Library;
@ -102,10 +103,10 @@ public abstract class TileEntityTurretBase extends TileEntity {
}
private boolean isInSight(Entity e) {
if(!(e instanceof EntityLivingBase) && !(e instanceof EntityMissileBaseAdvanced))
if(!(e instanceof EntityLivingBase) && !(e instanceof EntityMissileBaseAdvanced) && !(e instanceof EntityBomber))
return false;
if(this instanceof TileEntityTurretCIWS && !(e instanceof EntityMissileBaseAdvanced))
if(this instanceof TileEntityTurretCIWS && !(e instanceof EntityMissileBaseAdvanced) && !(e instanceof EntityBomber))
return false;
if(e instanceof EntityPlayer && players.contains((((EntityPlayer)e).getUniqueID().toString())))

View File

@ -223,6 +223,7 @@ public class TileEntityBlastDoor extends TileEntityLockableBase {
if(!((TileEntityBlastDoor)te0).isLocked()) {
((TileEntityBlastDoor)te0).setPins(this.lock);
((TileEntityBlastDoor)te0).lock();
((TileEntityBlastDoor)te0).setMod(lockMod);
}
}
@ -231,6 +232,7 @@ public class TileEntityBlastDoor extends TileEntityLockableBase {
if(!((TileEntityBlastDoor)te1).isLocked()) {
((TileEntityBlastDoor)te1).setPins(this.lock);
((TileEntityBlastDoor)te1).lock();
((TileEntityBlastDoor)te1).setMod(lockMod);
}
}
@ -239,6 +241,7 @@ public class TileEntityBlastDoor extends TileEntityLockableBase {
if(!((TileEntityBlastDoor)te2).isLocked()) {
((TileEntityBlastDoor)te2).setPins(this.lock);
((TileEntityBlastDoor)te2).lock();
((TileEntityBlastDoor)te2).setMod(lockMod);
}
}
@ -247,6 +250,7 @@ public class TileEntityBlastDoor extends TileEntityLockableBase {
if(!((TileEntityBlastDoor)te3).isLocked()) {
((TileEntityBlastDoor)te3).setPins(this.lock);
((TileEntityBlastDoor)te3).lock();
((TileEntityBlastDoor)te3).setMod(lockMod);
}
}
}

View File

@ -15,6 +15,7 @@ public abstract class TileEntityLockableBase extends TileEntity {
protected int lock;
private boolean isLocked = false;
protected double lockMod = 0.1D;
public boolean isLocked() {
return isLocked;
@ -33,12 +34,17 @@ public abstract class TileEntityLockableBase extends TileEntity {
lock = pins;
}
public void setMod(double mod) {
lockMod = mod;
}
@Override
public void readFromNBT(NBTTagCompound nbt) {
super.readFromNBT(nbt);
lock = nbt.getInteger("lock");
isLocked = nbt.getBoolean("isLocked");
lockMod = nbt.getDouble("lockMod");
}
@Override
@ -47,6 +53,7 @@ public abstract class TileEntityLockableBase extends TileEntity {
nbt.setInteger("lock", lock);
nbt.setBoolean("isLocked", isLocked);
nbt.setDouble("lockMod", lockMod);
}
public boolean canAccess(EntityPlayer player) {
@ -67,32 +74,42 @@ public abstract class TileEntityLockableBase extends TileEntity {
return true;
}
if(stack != null && stack.getItem() == ModItems.pin && player.inventory.hasItem(ModItems.screwdriver)) {
return tryPick(player);
}
}
stack.stackSize--;
private boolean tryPick(EntityPlayer player) {
if(player.worldObj.rand.nextInt(10) == 0 || Library.checkArmorPiece(player, ModItems.jackt, 2) || Library.checkArmorPiece(player, ModItems.jackt2, 2)) {
worldObj.playSoundAtEntity(player, "hbm:item.pinUnlock", 1.0F, 1.0F);
return true;
} else {
worldObj.playSoundAtEntity(player, "hbm:item.pinBreak", 1.0F, 0.8F + player.worldObj.rand.nextFloat() * 0.2F);
return false;
}
boolean canPick = false;
ItemStack stack = player.getHeldItem();
double chanceOfSuccess = this.lockMod * 100;
if(stack != null && stack.getItem() == ModItems.pin && player.inventory.hasItem(ModItems.screwdriver)) {
stack.stackSize--;
canPick = true;
}
if(stack != null && stack.getItem() == ModItems.screwdriver && player.inventory.hasItem(ModItems.pin)) {
player.inventory.consumeInventoryItem(ModItems.pin);
player.inventoryContainer.detectAndSendChanges();
canPick = true;
}
if(canPick) {
if(Library.checkArmorPiece(player, ModItems.jackt, 2) || Library.checkArmorPiece(player, ModItems.jackt2, 2))
chanceOfSuccess *= 100D;
double rand = player.worldObj.rand.nextDouble() * 100;
if(chanceOfSuccess > rand) {
worldObj.playSoundAtEntity(player, "hbm:item.pinUnlock", 1.0F, 1.0F);
return true;
}
if(stack != null && stack.getItem() == ModItems.screwdriver && player.inventory.hasItem(ModItems.pin)) {
player.inventory.consumeInventoryItem(ModItems.pin);
player.inventoryContainer.detectAndSendChanges();
if(player.worldObj.rand.nextInt(10) == 0 || Library.checkArmorPiece(player, ModItems.jackt, 2) || Library.checkArmorPiece(player, ModItems.jackt2, 2)) {
worldObj.playSoundAtEntity(player, "hbm:item.pinUnlock", 1.0F, 1.0F);
return true;
} else {
worldObj.playSoundAtEntity(player, "hbm:item.pinBreak", 1.0F, 0.8F + player.worldObj.rand.nextFloat() * 0.2F);
return false;
}
}
worldObj.playSoundAtEntity(player, "hbm:item.pinBreak", 1.0F, 0.8F + player.worldObj.rand.nextFloat() * 0.2F);
}
return false;