Better turret textures, isotope textures, turret ammo, reactor fix

This commit is contained in:
HbmMods 2017-11-02 10:26:51 +01:00
parent e1bbaa2e41
commit 7567f8696d
117 changed files with 4786 additions and 2011 deletions

View File

@ -34,6 +34,8 @@ hbmfluid.acid=Wasserstoffperoxid
hbmfluid.watz=Giftiger Schlamm
hbmfluid.biogas=Biogas
hbmfluid.biofuel=Biodiesel
hbmfluid.sas3=Schrabidiumtrisulfat
hbmfluid.nitan=NITAN© 100 Oktan Supertreibstoff
chem.TEST=Test
chem.FP_HEAVYOIL=Schwerölverarbeitung
@ -70,11 +72,16 @@ chem.SF_LIGHTOIL=Leichtölverfestigung
chem.SF_KEROSENE=Kerosinverfestigung
chem.SF_GAS=Erdgasverfestigung
chem.SF_PETROLEUM=Petroleumgasverfestigung
chem.SF_BIOGAS=Biogasverfestigung
chem.SF_BIOFUEL=Biodieselverfestigung
chem.POLYMER=Polymersynthese
chem.DEUTERIUM=Deuteriumextrahierung
chem.STEAM=WWasser kochen
chem.UF6=Uranhexafluoritproduktion
chem.PUF6=Plutoniumhexafluoritproduktion
chem.BP_BIOGAS=Biogasherstellung
chem.BP_BIOFUEL=Biodieselumesterung
chem.SAS3=Schrabidiumtrisulfatherstellung
item.record.lc.desc=Valve - Diabolic Adrenaline Guitar/Lambda Core
item.record.ss.desc=Valve - Sector Sweep
@ -382,6 +389,8 @@ item.ingot_polymer.name=Polymerbarren
item.bolt_dura_steel.name=Schnellarbeitsstahlbolzen
item.pipes_steel.name=Stahlrohre
item.drill_titanium.name=Titanbohrer
item.bolt_tungsten.name=Wolframbolzen
item.bolt_compound.name=Verstärkte Turbinenwelle
item.ingot_australium.name=Australiumbarren
item.ingot_weidanium.name=Weidaniumbarren
@ -669,7 +678,7 @@ item.canister_empty.name=Leerer Kanister
item.canister_smear.name=Industrieölkanister
item.canister_canola.name=Schmiermittelkanister
item.canister_oil.name=Rohölkanister
item.canister_fuel.name=Treibstoffkanister
item.canister_fuel.name=Dieselkanister
item.canister_kerosene.name=Kerosinkanister
item.canister_reoil.name=Kanister voll aufbereitetem Industrieöl
item.canister_petroil.name=Gemischkanister
@ -680,9 +689,11 @@ item.canister_bitumen.name=Bitumenkanister
item.canister_heatingoil.name=Heizölkanister
item.canister_naphtha.name=Mitteldestillatkanister
item.canister_lightoil.name=Leichtölkanister
item.canister_biofuel.name=Biodieselkanister
item.gas_empty.name=Leerer Gastank
item.gas_full.name=Gastank
item.gas_petroleum.name=Petroleumgastank
item.gas_biogas.name=Biogastank
item.fluid_tank_empty.name=Leere universelle Flüssigkeitszelle
item.fluid_tank_full.name=Universelle Flüssigkeitszelle:
item.fluid_barrel_empty.name=Leeres Fass
@ -939,6 +950,12 @@ item.gun_hp_ammo.name=Tintenpatrone
item.gun_euthanasia_ammo.name=Spritze
item.gun_defabricator_ammo.name=Defabrikator-Energiezelle
item.turret_light_ammo.name=Leichte MG Munitionskiste
item.turret_heavy_ammo.name=Schwere MG Munition
item.turret_rocket_ammo.name=Raketengeschütz 2x4 Munition
item.turret_flamer_ammo.name=Flammenwerfergeschütz-Tanks
item.turret_tau_ammo.name=Tauonengeschütz-Uranmunition
item.clip_revolver_iron.name=Box voll Eisenkugeln
item.clip_revolver.name=.357 Magnum Patronen
item.clip_revolver_gold.name=Schatulle mit goldenen Patronen
@ -1003,6 +1020,8 @@ item.generator_steel.name=Generator
item.blade_titanium.name=Titanturbinenschaufel
item.turbine_titanium.name=Dampfturbine
item.generator_front.name=Generatorfront
item.blade_tungsten.name=Wolframverstärktes Turbinenblatt
item.turbine_tungsten.name=Verstärkte Turbofanblätter
item.combine_scrap.name=CMB Schrott
item.chopper_head.name=Jagdschrauber Cockpit
@ -1018,6 +1037,7 @@ item.apple_astatine.name=Euphemiumapfel
item.ingot_astatine.name=Euphemiumbarren
item.nugget_astatine.name=Euphemiumnugget
item.rod_quad_astatine.name=Ausgebrannter Schrabidiumvierfachbrennstab
item.plate_euphemium.name=Euphemium-Verbundplatte
item.astatine_helmet.name=Euphemiumstiefel
item.astatine_plate.name=Euphemiumbrustplatte
@ -1278,6 +1298,7 @@ item.pellet_coolant.name=Kühlcluster
item.linker.name=Telelinker
item.oil_detector.name=Ölvorkommen-Detektor
item.geiger_counter.name=Geigerzähler
item.survey_scanner.name=Tiefenscanner
item.thermo_element.name=Thermoelektrisches Element
item.limiter.name=Generator-Limiter

View File

@ -34,6 +34,8 @@ hbmfluid.acid=Hydrogen Peroxide
hbmfluid.watz=Poisonous Mud
hbmfluid.biogas=Biogas
hbmfluid.biofuel=Biofuel
hbmfluid.sas3=Schrabidium Trisulfide
hbmfluid.nitan=NITAN© 100 Octane Super Fuel
chem.TEST=Test
chem.FP_HEAVYOIL=Heavy Oil Processing
@ -70,11 +72,16 @@ chem.SF_LIGHTOIL=Light Oil Solidification
chem.SF_KEROSENE=Kerosene Solidification
chem.SF_GAS=Natural Gas Solidification
chem.SF_PETROLEUM=Petroleum Gas Solidification
chem.SF_BIOGAS=Biogas Solidification
chem.SF_BIOFUEL=Biofuel Solidification
chem.POLYMER=Polymer Synthesis
chem.DEUTERIUM=Deuterium Extraction
chem.STEAM=Water Boiling
chem.UF6=Uranium Hexafluoride Production
chem.PUF6=Plutonium Hexafluoride Production
chem.BP_BIOGAS=Biogas Production
chem.BP_BIOFUEL=Biofuel Transesterification
chem.SAS3=Schrabidium Trisulfide Production
item.record.lc.desc=Valve - Diabolic Adrenaline Guitar/Lambda Core
item.record.ss.desc=Valve - Sector Sweep
@ -382,6 +389,8 @@ item.ingot_polymer.name=Polymer Ingot
item.bolt_dura_steel.name=High-Speed Steel Bolt
item.pipes_steel.name=Steel Pipes
item.drill_titanium.name=Titanium Drill
item.bolt_tungsten.name=Tunsten Bolt
item.bolt_compound.name=Reinforced Turbine Shaft
item.ingot_australium.name=Australium Ingot
item.ingot_weidanium.name=Weidanium Ingot
@ -669,7 +678,7 @@ item.canister_empty.name=Empty Canister
item.canister_smear.name=Industrial Oil Canister
item.canister_canola.name=Engine Lubricant
item.canister_oil.name=Crude Oil Canister
item.canister_fuel.name=Fuel Canister
item.canister_fuel.name=Diesel Canister
item.canister_kerosene.name=Kerosene Canister
item.canister_reoil.name=Canister of Reclaimed Industrial Oil
item.canister_petroil.name=Petroil Canister
@ -680,9 +689,11 @@ item.canister_bitumen.name=Bitumen Canister
item.canister_heatingoil.name=Heating Oil Canister
item.canister_naphtha.name=Naphtha Canister
item.canister_lightoil.name=Light Oil Canister
item.canister_biofuel.name=Biofuel Canister
item.gas_empty.name=Empty Gas Tank
item.gas_full.name=Gas Tank
item.gas_petroleum.name=Petroleum Gas Tank
item.gas_biogas.name=Biogas Tank
item.fluid_tank_empty.name=Empty Universal Fluid Tank
item.fluid_tank_full.name=Universal Fluid Tank:
item.fluid_barrel_empty.name=Empty Fluid Barrel
@ -939,6 +950,12 @@ item.gun_hp_ammo.name=Ink Cartridge
item.gun_euthanasia_ammo.name=Syringe
item.gun_defabricator_ammo.name=Defabricator Energy Cell
item.turret_light_ammo.name=Light MG Turret Ammo Box
item.turret_heavy_ammo.name=Heavy MG Turret Ammunition
item.turret_rocket_ammo.name=Rocket Turret 2x4 Ammunition
item.turret_flamer_ammo.name=Flamer Turret Fuel Tanks
item.turret_tau_ammo.name=Tau Turret Uranium Ammo
item.clip_revolver_iron.name=Box of Iron Rounds
item.clip_revolver.name=Box of .357 Rounds
item.clip_revolver_gold.name=Small Coffer of Golden Bullets
@ -1003,6 +1020,8 @@ item.generator_steel.name=Generator Body
item.blade_titanium.name=Titanium Blade
item.turbine_titanium.name=Titanium Steam Turbine
item.generator_front.name=Generator Front
item.blade_tungsten.name=Tungsten Reinforced Blade
item.turbine_tungsten.name=Reinforced Turbofan Blades
item.combine_scrap.name=CMB Scrap Metal
item.chopper_head.name=Hunter Chopper Cockpit
@ -1018,6 +1037,7 @@ item.apple_astatine.name=Euphemium Apple
item.ingot_astatine.name=Euphemium Ingot
item.nugget_astatine.name=Euphemium Nugget
item.rod_quad_astatine.name=Burned Out Quad Schrabidium Fuel Rod
item.plate_euphemium.name=Euphemium Compound Plate
item.astatine_helmet.name=Euphemium Helemt
item.astatine_plate.name=Euphemium Chestplate
@ -1278,6 +1298,7 @@ item.pellet_coolant.name=Coolant Cluster
item.linker.name=Telelinker
item.oil_detector.name=Oil Reservoir Detector
item.geiger_counter.name=Geiger Counter
item.survey_scanner.name=Survey Scanner
item.thermo_element.name=Thermoelectric Element
item.limiter.name=Generator Limiter

File diff suppressed because it is too large Load Diff

View File

@ -41,6 +41,86 @@ v -0.368061 0.125000 -0.212500
v -0.368061 0.250000 -0.212500
v -0.212500 0.125000 -0.368061
v -0.212500 0.250000 -0.368061
vt 0.698520 0.032316
vt 0.963791 0.164951
vt 0.831156 0.430222
vt 0.172997 0.501253
vt 0.172997 0.454359
vt 0.360572 0.454359
vt 0.032316 0.172997
vt 0.079210 0.172997
vt 0.079210 0.360572
vt 0.487518 0.139838
vt 0.454359 0.172997
vt 0.360572 0.079210
vt 0.046051 0.393730
vt 0.501253 0.360572
vt 0.454359 0.360572
vt 0.360572 0.032316
vt 0.172997 0.079210
vt 0.393731 0.487518
vt 0.139839 0.046051
vt 0.191950 0.920790
vt 0.274481 0.920790
vt 0.274481 0.967684
vt 0.345955 0.879524
vt 0.369402 0.920135
vt 0.387221 0.808050
vt 0.427832 0.831497
vt 0.387221 0.725519
vt 0.434115 0.725519
vt 0.345955 0.654045
vt 0.386567 0.630598
vt 0.274481 0.612779
vt 0.297928 0.572168
vt 0.191950 0.612779
vt 0.191950 0.565885
vt 0.120476 0.654045
vt 0.097029 0.613433
vt 0.079210 0.725519
vt 0.038599 0.702072
vt 0.079210 0.808050
vt 0.032316 0.808050
vt 0.120475 0.879524
vt 0.168503 0.961401
vt 0.079864 0.902971
vt 0.346504 0.404862
vt 0.266784 0.426223
vt 0.187065 0.404862
vt 0.128707 0.346503
vt 0.107346 0.266784
vt 0.128707 0.187065
vt 0.187065 0.128707
vt 0.404862 0.346504
vt 0.426223 0.266784
vt 0.404862 0.187065
vt 0.346504 0.128707
vt 0.266785 0.107346
vt 0.698520 0.430222
vt 0.565885 0.297587
vt 0.565885 0.164951
vt 0.831156 0.032316
vt 0.963791 0.297587
vt 0.360572 0.501253
vt 0.032316 0.360572
vt 0.393731 0.046051
vt 0.139838 0.487518
vt 0.501253 0.172997
vt 0.172997 0.032316
vt 0.487518 0.393731
vt 0.046051 0.139838
vt 0.191950 0.967684
vt 0.297928 0.961401
vt 0.386567 0.902971
vt 0.434115 0.808050
vt 0.427832 0.702072
vt 0.369402 0.613433
vt 0.274481 0.565885
vt 0.168503 0.572168
vt 0.079864 0.630598
vt 0.032316 0.725519
vt 0.097029 0.920135
vt 0.038599 0.831497
vn 0.000000 -1.000000 0.000000
vn 0.000000 0.000000 -1.000000
vn -1.000000 0.000000 0.000000
@ -60,79 +140,79 @@ vn -0.965900 0.000000 -0.258800
vn 0.000000 1.000000 0.000000
vn -0.258800 0.000000 -0.965900
s off
f 2//1 5//1 8//1
f 6//2 14//2 13//2
f 1//3 10//3 9//3
f 5//4 15//4 12//4
f 3//5 9//5 14//5
f 7//6 16//6 15//6
f 4//7 12//7 11//7
f 2//8 13//8 16//8
f 8//9 11//9 10//9
f 18//10 20//10 19//10
f 20//8 22//8 21//8
f 22//11 24//11 23//11
f 24//12 26//12 25//12
f 26//4 28//4 27//4
f 28//13 30//13 29//13
f 30//14 32//14 31//14
f 32//9 34//9 33//9
f 34//15 36//15 35//15
f 36//16 38//16 37//16
f 38//17 30//17 22//17
f 40//18 18//18 17//18
f 38//5 40//5 39//5
f 16//17 13//17 19//17
f 19//17 13//17 17//17
f 13//17 14//17 17//17
f 17//17 14//17 39//17
f 9//17 37//17 39//17
f 37//17 9//17 35//17
f 9//17 10//17 35//17
f 35//17 10//17 33//17
f 11//17 31//17 33//17
f 21//17 23//17 16//17
f 15//17 25//17 27//17
f 25//17 15//17 23//17
f 15//17 16//17 23//17
f 27//17 29//17 12//17
f 31//17 11//17 29//17
f 11//17 12//17 29//17
f 8//1 1//1 3//1
f 3//1 6//1 2//1
f 2//1 7//1 5//1
f 5//1 4//1 8//1
f 8//1 3//1 2//1
f 2//2 6//2 13//2
f 3//3 1//3 9//3
f 4//4 5//4 12//4
f 6//5 3//5 14//5
f 5//6 7//6 15//6
f 8//7 4//7 11//7
f 7//8 2//8 16//8
f 1//9 8//9 10//9
f 17//10 18//10 19//10
f 19//8 20//8 21//8
f 21//11 22//11 23//11
f 23//12 24//12 25//12
f 25//4 26//4 27//4
f 27//13 28//13 29//13
f 29//14 30//14 31//14
f 31//9 32//9 33//9
f 33//15 34//15 35//15
f 35//16 36//16 37//16
f 22//17 20//17 18//17
f 18//17 40//17 22//17
f 38//17 36//17 30//17
f 34//17 32//17 30//17
f 30//17 28//17 22//17
f 26//17 24//17 22//17
f 22//17 40//17 38//17
f 36//17 34//17 30//17
f 28//17 26//17 22//17
f 39//18 40//18 17//18
f 37//5 38//5 39//5
f 21//17 16//17 19//17
f 14//17 9//17 39//17
f 10//17 11//17 33//17
f 12//17 15//17 27//17
f 2/1/1 5/2/1 8/3/1
f 6/4/2 14/5/2 13/6/2
f 1/7/3 10/8/3 9/9/3
f 5/10/4 15/11/4 12/12/4
f 3/13/5 9/9/5 14/5/5
f 7/14/6 16/15/6 15/11/6
f 4/16/7 12/12/7 11/17/7
f 2/18/8 13/6/8 16/15/8
f 8/19/9 11/17/9 10/8/9
f 18/20/10 20/21/10 19/22/10
f 20/21/8 22/23/8 21/24/8
f 22/23/11 24/25/11 23/26/11
f 24/25/12 26/27/12 25/28/12
f 26/27/4 28/29/4 27/30/4
f 28/29/13 30/31/13 29/32/13
f 30/31/14 32/33/14 31/34/14
f 32/33/9 34/35/9 33/36/9
f 34/35/15 36/37/15 35/38/15
f 36/37/16 38/39/16 37/40/16
f 38/39/17 30/31/17 22/23/17
f 40/41/18 18/20/18 17/42/18
f 38/39/5 40/41/5 39/43/5
f 16/15/17 13/6/17 19/44/17
f 19/44/17 13/6/17 17/45/17
f 13/6/17 14/5/17 17/45/17
f 17/45/17 14/5/17 39/46/17
f 9/9/17 37/47/17 39/46/17
f 37/47/17 9/9/17 35/48/17
f 9/9/17 10/8/17 35/48/17
f 35/48/17 10/8/17 33/49/17
f 11/17/17 31/50/17 33/49/17
f 21/51/17 23/52/17 16/15/17
f 15/11/17 25/53/17 27/54/17
f 25/53/17 15/11/17 23/52/17
f 15/11/17 16/15/17 23/52/17
f 27/54/17 29/55/17 12/12/17
f 31/50/17 11/17/17 29/55/17
f 11/17/17 12/12/17 29/55/17
f 8/3/1 1/56/1 3/57/1
f 3/57/1 6/58/1 2/1/1
f 2/1/1 7/59/1 5/2/1
f 5/2/1 4/60/1 8/3/1
f 8/3/1 3/57/1 2/1/1
f 2/61/2 6/4/2 13/6/2
f 3/62/3 1/7/3 9/9/3
f 4/63/4 5/10/4 12/12/4
f 6/64/5 3/13/5 14/5/5
f 5/65/6 7/14/6 15/11/6
f 8/66/7 4/16/7 11/17/7
f 7/67/8 2/18/8 16/15/8
f 1/68/9 8/19/9 10/8/9
f 17/69/10 18/20/10 19/22/10
f 19/70/8 20/21/8 21/24/8
f 21/71/11 22/23/11 23/26/11
f 23/72/12 24/25/12 25/28/12
f 25/73/4 26/27/4 27/30/4
f 27/74/13 28/29/13 29/32/13
f 29/75/14 30/31/14 31/34/14
f 31/76/9 32/33/9 33/36/9
f 33/77/15 34/35/15 35/38/15
f 35/78/16 36/37/16 37/40/16
f 22/23/17 20/21/17 18/20/17
f 18/20/17 40/41/17 22/23/17
f 38/39/17 36/37/17 30/31/17
f 34/35/17 32/33/17 30/31/17
f 30/31/17 28/29/17 22/23/17
f 26/27/17 24/25/17 22/23/17
f 22/23/17 40/41/17 38/39/17
f 36/37/17 34/35/17 30/31/17
f 28/29/17 26/27/17 22/23/17
f 39/79/18 40/41/18 17/42/18
f 37/80/5 38/39/5 39/43/5
f 21/51/17 16/15/17 19/44/17
f 14/5/17 9/9/17 39/46/17
f 10/8/17 11/17/17 33/49/17
f 12/12/17 15/11/17 27/54/17

View File

@ -109,6 +109,180 @@ v -0.075000 0.554834 0.137964
v -0.075000 0.734018 -0.328826
v 0.075000 0.734018 -0.328826
v 0.075000 0.554834 0.137964
vt 0.433336 0.891529
vt 0.433336 0.871043
vt 0.767919 0.871043
vt 0.433336 0.850557
vt 0.767919 0.850557
vt 0.433336 0.830070
vt 0.767919 0.830070
vt 0.433336 0.809584
vt 0.767919 0.809584
vt 0.433337 0.973475
vt 0.433337 0.952988
vt 0.767919 0.952988
vt 0.433336 0.932502
vt 0.767919 0.932502
vt 0.433336 0.912016
vt 0.767919 0.891529
vt 0.767919 0.912015
vt 0.880596 0.024656
vt 0.892961 0.019535
vt 0.892961 0.050264
vt 0.880596 0.198789
vt 0.880596 0.178303
vt 0.892961 0.173182
vt 0.260434 0.695260
vt 0.260434 0.775560
vt 0.153367 0.775559
vt 0.892961 0.111723
vt 0.959877 0.111723
vt 0.959877 0.142452
vt 0.153368 0.426926
vt 0.153368 0.293093
vt 0.260434 0.293093
vt 0.153368 0.019535
vt 0.260434 0.019535
vt 0.260434 0.159260
vt 0.153367 0.695260
vt 0.153368 0.560759
vt 0.260434 0.560759
vt 0.153368 0.159260
vt 0.260434 0.426926
vt 0.394267 0.560759
vt 0.059684 0.694592
vt 0.019535 0.560759
vt 0.880596 0.106601
vt 0.880596 0.086115
vt 0.892961 0.080993
vt 0.880596 0.239762
vt 0.892961 0.234640
vt 0.892961 0.265370
vt 0.880596 0.168060
vt 0.880596 0.147574
vt 0.892961 0.142452
vt 0.880596 0.116844
vt 0.880596 0.055386
vt 0.880596 0.209033
vt 0.892961 0.203911
vt 0.959877 0.173182
vt 0.959877 0.234640
vt 0.959877 0.265370
vt 0.959877 0.050264
vt 0.959877 0.080993
vt 0.959877 0.203911
vt 0.959877 0.019535
vt 0.637432 0.148299
vt 0.567169 0.168207
vt 0.530686 0.039442
vt 0.637432 0.227930
vt 0.567169 0.208022
vt 0.600948 0.356694
vt 0.530686 0.336786
vt 0.433336 0.208022
vt 0.771265 0.148299
vt 0.806396 0.208189
vt 0.771265 0.227929
vt 0.792201 0.202309
vt 0.393186 0.829994
vt 0.259353 0.829994
vt 0.259353 0.814629
vt 0.786321 0.188114
vt 0.792201 0.173919
vt 0.393186 0.845358
vt 0.259353 0.845358
vt 0.806396 0.168039
vt 0.393186 0.860723
vt 0.259353 0.860723
vt 0.820591 0.202309
vt 0.841527 0.208022
vt 0.393186 0.876088
vt 0.259353 0.876088
vt 0.826471 0.188114
vt 0.393186 0.891452
vt 0.259353 0.891453
vt 0.841527 0.168206
vt 0.393186 0.906817
vt 0.259353 0.906817
vt 0.820591 0.173919
vt 0.393186 0.922182
vt 0.393186 0.937547
vt 0.259353 0.937547
vt 0.259353 0.922182
vt 0.220284 0.937547
vt 0.220284 0.958033
vt 0.019535 0.958033
vt 0.220284 0.978519
vt 0.019535 0.978519
vt 0.220284 0.814629
vt 0.220284 0.835115
vt 0.019535 0.835115
vt 0.220284 0.855602
vt 0.019535 0.855602
vt 0.220284 0.876088
vt 0.019535 0.876088
vt 0.220284 0.896574
vt 0.019535 0.896574
vt 0.220284 0.917060
vt 0.019535 0.937547
vt 0.019535 0.917060
vt 0.819866 0.422530
vt 0.819866 0.529596
vt 0.793099 0.529596
vt 0.953699 0.422530
vt 0.953699 0.529596
vt 0.980465 0.422530
vt 0.980465 0.529596
vt 0.819866 0.663429
vt 0.819866 0.556363
vt 0.953699 0.556363
vt 0.819866 0.395763
vt 0.676377 0.687137
vt 0.708754 0.557280
vt 0.754030 0.574125
vt 0.573608 0.444071
vt 0.573608 0.395763
vt 0.613758 0.395763
vt 0.510989 0.687137
vt 0.481298 0.699069
vt 0.433336 0.574125
vt 0.613758 0.738516
vt 0.613758 0.770515
vt 0.573608 0.770515
vt 0.613758 0.444071
vt 0.613758 0.492378
vt 0.573608 0.492378
vt 0.573608 0.706517
vt 0.573608 0.674519
vt 0.613758 0.674519
vt 0.478612 0.557280
vt 0.525602 0.546078
vt 0.541913 0.678913
vt 0.645454 0.678913
vt 0.573608 0.738516
vt 0.613758 0.706517
vt 0.573608 0.540686
vt 0.613758 0.540686
vt 0.661764 0.546078
vt 0.767919 0.973474
vt 0.880596 0.045142
vt 0.354117 0.694592
vt 0.273817 0.694592
vt 0.394267 0.426926
vt 0.019535 0.426926
vt 0.139984 0.694592
vt 0.880596 0.260248
vt 0.880596 0.137331
vt 0.880596 0.075872
vt 0.880596 0.229519
vt 0.600948 0.019535
vt 0.433336 0.168207
vt 0.393186 0.814629
vt 0.019535 0.814629
vt 0.793099 0.422530
vt 0.953699 0.663429
vt 0.953699 0.395763
vt 0.706068 0.699069
vn 0.382700 0.923900 -0.000000
vn 0.923900 0.382700 -0.000000
vn 0.923900 -0.382700 0.000000
@ -143,165 +317,163 @@ vn 0.000000 -0.106400 0.994300
vn 0.000000 0.933600 0.358400
vn 0.000000 0.251900 -0.967700
s off
f 2//1 4//1 3//1
f 4//2 6//2 5//2
f 6//3 8//3 7//3
f 8//4 10//4 9//4
f 10//5 12//5 11//5
f 12//6 14//6 13//6
f 16//7 2//7 1//7
f 14//8 16//8 15//8
f 9//9 33//9 32//9
f 13//9 15//9 36//9
f 24//10 23//10 19//10
f 30//1 37//1 39//1
f 18//9 17//9 21//9
f 19//11 23//11 28//11
f 24//12 20//12 25//12
f 27//13 25//13 18//13
f 26//14 28//14 21//14
f 27//15 22//15 28//15
f 25//16 19//16 26//16
f 3//9 5//9 31//9
f 11//9 34//9 33//9
f 15//9 1//9 29//9
f 3//9 30//9 29//9
f 7//9 32//9 31//9
f 13//9 35//9 34//9
f 35//8 36//8 44//8
f 34//5 42//5 41//5
f 32//3 40//3 38//3
f 31//2 38//2 37//2
f 29//7 39//7 44//7
f 34//6 35//6 43//6
f 33//4 41//4 40//4
f 48//17 47//17 45//17
f 52//10 51//10 47//10
f 50//18 49//18 51//18
f 47//14 51//14 49//14
f 52//13 48//13 46//13
f 58//9 50//9 56//9
f 55//5 56//5 54//5
f 54//9 46//9 68//9
f 57//6 58//6 56//6
f 68//9 46//9 66//9
f 59//8 60//8 58//8
f 58//9 60//9 49//9
f 61//7 62//7 60//7
f 60//9 62//9 49//9
f 63//1 64//1 62//1
f 50//9 46//9 54//9
f 45//9 49//9 62//9
f 65//2 66//2 64//2
f 62//9 64//9 45//9
f 67//4 53//4 54//4
f 67//3 68//3 66//3
f 56//9 50//9 54//9
f 45//9 64//9 66//9
f 70//19 72//19 71//19
f 72//20 74//20 73//20
f 74//21 76//21 75//21
f 76//22 78//22 77//22
f 78//23 80//23 79//23
f 80//24 82//24 81//24
f 84//25 70//25 69//25
f 82//26 84//26 83//26
f 88//16 87//16 85//16
f 92//10 91//10 87//10
f 90//15 89//15 91//15
f 86//9 85//9 89//9
f 87//14 91//14 89//14
f 92//13 88//13 86//13
f 94//16 96//16 95//16
f 100//27 99//27 95//27
f 98//15 97//15 99//15
f 94//28 93//28 97//28
f 95//14 99//14 97//14
f 96//29 102//29 103//29
f 104//30 108//30 105//30
f 100//15 103//15 104//15
f 96//16 94//16 101//16
f 98//31 104//31 101//31
f 107//32 106//32 105//32
f 102//33 106//33 107//33
f 103//15 107//15 108//15
f 102//16 101//16 105//16
f 1//1 2//1 3//1
f 3//2 4//2 5//2
f 5//3 6//3 7//3
f 7//4 8//4 9//4
f 9//5 10//5 11//5
f 11//6 12//6 13//6
f 15//7 16//7 1//7
f 13//8 14//8 15//8
f 7//9 9//9 32//9
f 35//9 13//9 36//9
f 20//10 24//10 19//10
f 29//1 30//1 39//1
f 22//9 18//9 21//9
f 26//11 19//11 28//11
f 27//12 24//12 25//12
f 22//13 27//13 18//13
f 17//14 26//14 21//14
f 28//15 23//15 27//15
f 24//15 27//15 23//15
f 22//15 21//15 28//15
f 26//16 17//16 18//16
f 18//16 25//16 26//16
f 20//16 19//16 25//16
f 30//9 3//9 31//9
f 9//9 11//9 33//9
f 36//9 15//9 29//9
f 1//9 3//9 29//9
f 5//9 7//9 31//9
f 11//9 13//9 34//9
f 43//8 35//8 44//8
f 33//5 34//5 41//5
f 31//3 32//3 38//3
f 30//2 31//2 37//2
f 36//7 29//7 44//7
f 42//6 34//6 43//6
f 32//4 33//4 40//4
f 46//17 48//17 45//17
f 48//10 52//10 47//10
f 52//18 50//18 51//18
f 45//14 47//14 49//14
f 50//13 52//13 46//13
f 53//5 55//5 54//5
f 55//6 57//6 56//6
f 57//8 59//8 58//8
f 50//9 58//9 49//9
f 59//7 61//7 60//7
f 61//1 63//1 62//1
f 63//2 65//2 64//2
f 68//4 67//4 54//4
f 65//3 67//3 66//3
f 46//9 45//9 66//9
f 69//19 70//19 71//19
f 71//20 72//20 73//20
f 73//21 74//21 75//21
f 75//22 76//22 77//22
f 77//23 78//23 79//23
f 79//24 80//24 81//24
f 83//25 84//25 69//25
f 81//26 82//26 83//26
f 86//16 88//16 85//16
f 88//10 92//10 87//10
f 92//15 90//15 91//15
f 90//9 86//9 89//9
f 85//14 87//14 89//14
f 90//13 92//13 86//13
f 93//16 94//16 95//16
f 96//27 100//27 95//27
f 100//15 98//15 99//15
f 98//28 94//28 97//28
f 93//14 95//14 97//14
f 100//29 96//29 103//29
f 101//30 104//30 105//30
f 98//15 100//15 104//15
f 102//16 96//16 101//16
f 94//31 98//31 101//31
f 108//32 107//32 105//32
f 103//33 102//33 107//33
f 104//15 103//15 108//15
f 106//16 102//16 105//16
f 2/1/1 4/2/1 3/3/1
f 4/2/2 6/4/2 5/5/2
f 6/4/3 8/6/3 7/7/3
f 8/6/4 10/8/4 9/9/4
f 10/10/5 12/11/5 11/12/5
f 12/11/6 14/13/6 13/14/6
f 16/15/7 2/1/7 1/16/7
f 14/13/8 16/15/8 15/17/8
f 9/18/9 33/19/9 32/20/9
f 13/21/9 15/22/9 36/23/9
f 24/24/10 23/25/10 19/26/10
f 30/27/1 37/28/1 39/29/1
f 18/30/9 17/31/9 21/32/9
f 19/33/11 23/34/11 28/35/11
f 24/24/12 20/36/12 25/37/12
f 27/38/13 25/37/13 18/30/13
f 26/39/14 28/35/14 21/32/14
f 27/38/15 22/40/15 28/41/15
f 25/37/16 19/42/16 26/43/16
f 3/44/9 5/45/9 31/46/9
f 11/47/9 34/48/9 33/49/9
f 15/50/9 1/51/9 29/52/9
f 3/53/9 30/27/9 29/52/9
f 7/54/9 32/20/9 31/46/9
f 13/55/9 35/56/9 34/48/9
f 35/56/8 36/23/8 44/57/8
f 34/48/5 42/58/5 41/59/5
f 32/20/3 40/60/3 38/61/3
f 31/46/2 38/61/2 37/28/2
f 29/52/7 39/29/7 44/57/7
f 34/48/6 35/56/6 43/62/6
f 33/19/4 41/63/4 40/60/4
f 48/64/17 47/65/17 45/66/17
f 52/67/10 51/68/10 47/65/10
f 50/69/18 49/70/18 51/68/18
f 47/65/14 51/68/14 49/71/14
f 52/67/13 48/64/13 46/72/13
f 58/73/9 50/74/9 56/75/9
f 55/76/5 56/77/5 54/78/5
f 54/79/9 46/72/9 68/80/9
f 57/81/6 58/82/6 56/77/6
f 68/80/9 46/72/9 66/83/9
f 59/84/8 60/85/8 58/82/8
f 58/73/9 60/86/9 49/87/9
f 61/88/7 62/89/7 60/85/7
f 60/86/9 62/90/9 49/87/9
f 63/91/1 64/92/1 62/89/1
f 50/74/9 46/72/9 54/79/9
f 45/93/9 49/87/9 62/90/9
f 65/94/2 66/95/2 64/92/2
f 62/90/9 64/96/9 45/93/9
f 67/97/4 53/98/4 54/99/4
f 67/97/3 68/100/3 66/95/3
f 56/75/9 50/74/9 54/79/9
f 45/93/9 64/96/9 66/83/9
f 70/101/19 72/102/19 71/103/19
f 72/102/20 74/104/20 73/105/20
f 74/106/21 76/107/21 75/108/21
f 76/107/22 78/109/22 77/110/22
f 78/109/23 80/111/23 79/112/23
f 80/111/24 82/113/24 81/114/24
f 84/115/25 70/101/25 69/116/25
f 82/113/26 84/115/26 83/117/26
f 88/118/16 87/119/16 85/120/16
f 92/121/10 91/122/10 87/119/10
f 90/123/15 89/124/15 91/122/15
f 86/125/9 85/126/9 89/127/9
f 87/119/14 91/122/14 89/127/14
f 92/121/13 88/118/13 86/128/13
f 94/129/16 96/130/16 95/131/16
f 100/132/27 99/133/27 95/134/27
f 98/135/15 97/136/15 99/137/15
f 94/138/28 93/139/28 97/140/28
f 96/141/29 102/142/29 103/143/29
f 104/144/30 108/145/30 105/146/30
f 100/147/15 103/148/15 104/149/15
f 96/130/16 94/129/16 101/150/16
f 98/151/31 104/144/31 101/152/31
f 107/153/32 106/154/32 105/146/32
f 102/142/33 106/154/33 107/153/33
f 103/148/15 107/153/15 108/145/15
f 102/155/16 101/150/16 105/146/16
f 1/16/1 2/1/1 3/3/1
f 3/3/2 4/2/2 5/5/2
f 5/5/3 6/4/3 7/7/3
f 7/7/4 8/6/4 9/9/4
f 9/156/5 10/10/5 11/12/5
f 11/12/6 12/11/6 13/14/6
f 15/17/7 16/15/7 1/16/7
f 13/14/8 14/13/8 15/17/8
f 7/157/9 9/18/9 32/20/9
f 35/56/9 13/21/9 36/23/9
f 20/36/10 24/24/10 19/26/10
f 29/52/1 30/27/1 39/29/1
f 22/40/9 18/30/9 21/32/9
f 26/39/11 19/33/11 28/35/11
f 27/38/12 24/24/12 25/37/12
f 22/40/13 27/38/13 18/30/13
f 17/31/14 26/39/14 21/32/14
f 28/41/15 23/158/15 27/38/15
f 24/159/15 27/38/15 23/158/15
f 22/40/15 21/160/15 28/41/15
f 26/43/16 17/161/16 18/30/16
f 18/30/16 25/37/16 26/43/16
f 20/162/16 19/42/16 25/37/16
f 30/27/9 3/44/9 31/46/9
f 9/163/9 11/47/9 33/49/9
f 36/23/9 15/50/9 29/52/9
f 1/164/9 3/53/9 29/52/9
f 5/165/9 7/54/9 31/46/9
f 11/166/9 13/55/9 34/48/9
f 43/62/8 35/56/8 44/57/8
f 33/49/5 34/48/5 41/59/5
f 31/46/3 32/20/3 38/61/3
f 30/27/2 31/46/2 37/28/2
f 36/23/7 29/52/7 44/57/7
f 42/58/6 34/48/6 43/62/6
f 32/20/4 33/19/4 40/60/4
f 46/167/17 48/64/17 45/66/17
f 48/64/10 52/67/10 47/65/10
f 52/67/18 50/69/18 51/68/18
f 45/168/14 47/65/14 49/71/14
f 50/74/13 52/67/13 46/72/13
f 53/169/5 55/76/5 54/78/5
f 55/76/6 57/81/6 56/77/6
f 57/81/8 59/84/8 58/82/8
f 50/74/9 58/73/9 49/87/9
f 59/84/7 61/88/7 60/85/7
f 61/88/1 63/91/1 62/89/1
f 63/91/2 65/94/2 64/92/2
f 68/100/4 67/97/4 54/99/4
f 65/94/3 67/97/3 66/95/3
f 46/72/9 45/93/9 66/83/9
f 69/116/19 70/101/19 71/103/19
f 71/103/20 72/102/20 73/105/20
f 73/170/21 74/106/21 75/108/21
f 75/108/22 76/107/22 77/110/22
f 77/110/23 78/109/23 79/112/23
f 79/112/24 80/111/24 81/114/24
f 83/117/25 84/115/25 69/116/25
f 81/114/26 82/113/26 83/117/26
f 86/171/16 88/118/16 85/120/16
f 88/118/10 92/121/10 87/119/10
f 92/121/15 90/123/15 91/122/15
f 90/172/9 86/125/9 89/127/9
f 85/126/14 87/119/14 89/127/14
f 90/173/13 92/121/13 86/128/13
f 93/174/16 94/129/16 95/131/16
f 96/141/27 100/132/27 95/134/27
f 100/147/15 98/135/15 99/137/15
f 98/151/28 94/138/28 97/140/28
f 100/132/29 96/141/29 103/143/29
f 101/152/30 104/144/30 105/146/30
f 98/135/15 100/147/15 104/149/15
f 102/155/16 96/130/16 101/150/16
f 94/138/31 98/151/31 101/152/31
f 108/145/32 107/153/32 105/146/32
f 103/143/33 102/142/33 107/153/33
f 104/149/15 103/148/15 108/145/15
f 106/154/16 102/155/16 105/146/16

View File

@ -65,6 +65,106 @@ v 0.200000 0.507596 0.386824
v 0.700000 0.507596 0.386824
v 0.200000 1.492404 0.213176
v 0.700000 1.342404 0.213176
vt 0.471550 0.978182
vt 0.442112 0.981045
vt 0.442112 0.962420
vt 0.412674 0.978182
vt 0.412674 0.959558
vt 0.752477 0.642507
vt 0.780414 0.671715
vt 0.429349 0.671715
vt 0.797175 0.700923
vt 0.429349 0.700923
vt 0.801831 0.730131
vt 0.429349 0.730131
vt 0.797175 0.759339
vt 0.429349 0.759339
vt 0.780413 0.788547
vt 0.429349 0.788547
vt 0.752477 0.817754
vt 0.018956 0.516973
vt 0.018956 0.487765
vt 0.386782 0.487765
vt 0.391438 0.516973
vt 0.386782 0.546181
vt 0.018956 0.546180
vt 0.370020 0.575389
vt 0.018955 0.575388
vt 0.342084 0.604596
vt 0.018955 0.671715
vt 0.018955 0.642508
vt 0.342084 0.642507
vt 0.018955 0.700923
vt 0.370020 0.671715
vt 0.018956 0.730131
vt 0.386782 0.700923
vt 0.391438 0.730131
vt 0.386782 0.759339
vt 0.018956 0.759339
vt 0.370020 0.788547
vt 0.018956 0.788546
vt 0.342084 0.817754
vt 0.752477 0.429349
vt 0.780414 0.458557
vt 0.429349 0.458557
vt 0.797175 0.487765
vt 0.429349 0.487765
vt 0.801831 0.516972
vt 0.429349 0.516973
vt 0.797175 0.546180
vt 0.429349 0.546181
vt 0.780413 0.575388
vt 0.429349 0.575389
vt 0.752478 0.604596
vt 0.380083 0.969703
vt 0.380083 0.951079
vt 0.342084 0.955935
vt 0.342084 0.937311
vt 0.018955 0.937311
vt 0.018955 0.458557
vt 0.018955 0.429349
vt 0.342084 0.429349
vt 0.370020 0.458557
vt 0.471550 0.959558
vt 0.504140 0.951079
vt 0.504140 0.969703
vt 0.542140 0.937311
vt 0.542140 0.955935
vt 0.865269 0.937310
vt 0.542140 0.899399
vt 0.542140 0.880775
vt 0.865269 0.880774
vt 0.504141 0.885631
vt 0.504141 0.867006
vt 0.471550 0.877152
vt 0.471550 0.858528
vt 0.442112 0.874289
vt 0.442112 0.855665
vt 0.412674 0.877152
vt 0.412674 0.858528
vt 0.380084 0.885631
vt 0.380084 0.867007
vt 0.342084 0.899399
vt 0.342084 0.880775
vt 0.018955 0.899399
vt 0.205197 0.018955
vt 0.205493 0.391438
vt 0.018955 0.336563
vt 0.243700 0.018955
vt 0.429942 0.018955
vt 0.429942 0.336563
vt 0.429349 0.642507
vt 0.429349 0.817754
vt 0.018955 0.604596
vt 0.018955 0.817754
vt 0.429349 0.429349
vt 0.429349 0.604596
vt 0.018955 0.955935
vt 0.865269 0.955935
vt 0.865269 0.899399
vt 0.018955 0.880775
vt 0.018955 0.018955
vt 0.243404 0.391438
vn 0.000000 0.987400 0.158200
vn 0.000000 0.987400 -0.158200
vn 0.881900 -0.000000 -0.471400
@ -89,87 +189,87 @@ vn -0.052000 0.173400 0.983500
vn 0.000000 0.203700 0.979000
vn 0.052000 0.173400 0.983500
s off
f 12//1 10//1 27//1
f 8//2 29//2 27//2
f 4//3 6//3 5//3
f 6//4 8//4 7//4
f 8//5 10//5 9//5
f 9//6 10//6 12//6
f 11//7 12//7 14//7
f 13//8 14//8 16//8
f 54//6 52//6 51//6
f 54//5 53//5 55//5
f 56//4 55//4 17//4
f 18//3 17//3 19//3
f 24//9 22//9 21//9
f 26//10 24//10 23//10
f 28//11 26//11 25//11
f 28//12 27//12 29//12
f 30//13 29//13 31//13
f 32//14 31//14 33//14
f 36//14 38//14 37//14
f 38//13 40//13 39//13
f 40//12 42//12 41//12
f 41//11 42//11 44//11
f 43//10 44//10 46//10
f 45//9 46//9 48//9
f 6//15 31//15 29//15
f 4//16 33//16 31//16
f 34//17 33//17 4//17
f 50//8 2//8 1//8
f 52//7 50//7 49//7
f 25//18 23//18 14//18
f 23//19 21//19 16//19
f 16//20 21//20 22//20
f 19//20 36//20 35//20
f 17//19 38//19 36//19
f 55//18 40//18 38//18
f 53//1 42//1 40//1
f 53//2 51//2 44//2
f 51//15 49//15 46//15
f 49//16 1//16 48//16
f 48//17 1//17 2//17
f 58//21 60//21 59//21
f 61//22 62//22 64//22
f 25//1 12//1 27//1
f 10//2 8//2 27//2
f 3//3 4//3 5//3
f 5//4 6//4 7//4
f 7//5 8//5 9//5
f 11//6 9//6 12//6
f 13//7 11//7 14//7
f 15//8 13//8 16//8
f 53//6 54//6 51//6
f 56//5 54//5 55//5
f 18//4 56//4 17//4
f 20//3 18//3 19//3
f 23//9 24//9 21//9
f 25//10 26//10 23//10
f 27//11 28//11 25//11
f 30//12 28//12 29//12
f 32//13 30//13 31//13
f 34//14 32//14 33//14
f 35//14 36//14 37//14
f 37//13 38//13 39//13
f 39//12 40//12 41//12
f 43//11 41//11 44//11
f 45//10 43//10 46//10
f 47//9 45//9 48//9
f 8//15 6//15 29//15
f 6//16 4//16 31//16
f 3//17 34//17 4//17
f 49//8 50//8 1//8
f 51//7 52//7 49//7
f 12//18 25//18 14//18
f 14//19 23//19 16//19
f 15//20 16//20 22//20
f 20//20 19//20 35//20
f 19//19 17//19 36//19
f 17//18 55//18 38//18
f 55//1 53//1 40//1
f 42//2 53//2 44//2
f 44//15 51//15 46//15
f 46//16 49//16 48//16
f 47//17 48//17 2//17
f 57//22 58//22 59//22
f 63//23 61//23 64//23
f 12/1/1 10/2/1 27/3/1
f 8/4/2 29/5/2 27/3/2
f 4/6/3 6/7/3 5/8/3
f 6/7/4 8/9/4 7/10/4
f 8/9/5 10/11/5 9/12/5
f 9/12/6 10/11/6 12/13/6
f 11/14/7 12/13/7 14/15/7
f 13/16/8 14/15/8 16/17/8
f 54/18/6 52/19/6 51/20/6
f 54/18/5 53/21/5 55/22/5
f 56/23/4 55/22/4 17/24/4
f 18/25/3 17/24/3 19/26/3
f 24/27/9 22/28/9 21/29/9
f 26/30/10 24/27/10 23/31/10
f 28/32/11 26/30/11 25/33/11
f 28/32/12 27/34/12 29/35/12
f 30/36/13 29/35/13 31/37/13
f 32/38/14 31/37/14 33/39/14
f 36/40/14 38/41/14 37/42/14
f 38/41/13 40/43/13 39/44/13
f 40/43/12 42/45/12 41/46/12
f 41/46/11 42/45/11 44/47/11
f 43/48/10 44/47/10 46/49/10
f 45/50/9 46/49/9 48/51/9
f 6/52/15 31/53/15 29/5/15
f 4/54/16 33/55/16 31/53/16
f 34/56/17 33/55/17 4/54/17
f 50/57/8 2/58/8 1/59/8
f 52/19/7 50/57/7 49/60/7
f 25/61/18 23/62/18 14/63/18
f 23/62/19 21/64/19 16/65/19
f 16/65/20 21/64/20 22/66/20
f 19/67/20 36/68/20 35/69/20
f 17/70/19 38/71/19 36/68/19
f 55/72/18 40/73/18 38/71/18
f 53/74/1 42/75/1 40/73/1
f 53/74/2 51/76/2 44/77/2
f 51/76/15 49/78/15 46/79/15
f 49/78/16 1/80/16 48/81/16
f 48/81/17 1/80/17 2/82/17
f 58/83/21 60/84/21 59/85/21
f 61/86/22 62/87/22 64/88/22
f 25/61/1 12/1/1 27/3/1
f 10/2/2 8/4/2 27/3/2
f 3/89/3 4/6/3 5/8/3
f 5/8/4 6/7/4 7/10/4
f 7/10/5 8/9/5 9/12/5
f 11/14/6 9/12/6 12/13/6
f 13/16/7 11/14/7 14/15/7
f 15/90/8 13/16/8 16/17/8
f 53/21/6 54/18/6 51/20/6
f 56/23/5 54/18/5 55/22/5
f 18/25/4 56/23/4 17/24/4
f 20/91/3 18/25/3 19/26/3
f 23/31/9 24/27/9 21/29/9
f 25/33/10 26/30/10 23/31/10
f 27/34/11 28/32/11 25/33/11
f 30/36/12 28/32/12 29/35/12
f 32/38/13 30/36/13 31/37/13
f 34/92/14 32/38/14 33/39/14
f 35/93/14 36/40/14 37/42/14
f 37/42/13 38/41/13 39/44/13
f 39/44/12 40/43/12 41/46/12
f 43/48/11 41/46/11 44/47/11
f 45/50/10 43/48/10 46/49/10
f 47/94/9 45/50/9 48/51/9
f 8/4/15 6/52/15 29/5/15
f 6/52/16 4/54/16 31/53/16
f 3/95/17 34/56/17 4/54/17
f 49/60/8 50/57/8 1/59/8
f 51/20/7 52/19/7 49/60/7
f 12/1/18 25/61/18 14/63/18
f 14/63/19 23/62/19 16/65/19
f 15/96/20 16/65/20 22/66/20
f 20/97/20 19/67/20 35/69/20
f 19/67/19 17/70/19 36/68/19
f 17/70/18 55/72/18 38/71/18
f 55/72/1 53/74/1 40/73/1
f 42/75/2 53/74/2 44/77/2
f 44/77/15 51/76/15 46/79/15
f 46/79/16 49/78/16 48/81/16
f 47/98/17 48/81/17 2/82/17
f 57/99/22 58/83/22 59/85/22
f 63/100/23 61/86/23 64/88/23

View File

@ -129,6 +129,216 @@ v -0.375000 0.100000 -0.000000
v 0.375000 0.100000 -0.000000
v -0.375000 0.070711 -0.070711
v 0.375000 0.070711 -0.070711
vt 0.409216 0.148396
vt 0.409216 0.246203
vt 0.148396 0.246203
vt 0.507024 0.246204
vt 0.507024 0.148396
vt 0.769874 0.148396
vt 0.148396 0.148396
vt 0.138615 0.167957
vt 0.044067 0.167957
vt 0.148396 0.017985
vt 0.409216 0.050588
vt 0.409216 0.344011
vt 0.260057 0.412584
vt 0.260057 0.575597
vt 0.181811 0.575597
vt 0.138615 0.226642
vt 0.017985 0.148395
vt 0.044067 0.226642
vt 0.017985 0.246203
vt 0.260057 0.634281
vt 0.181811 0.634281
vt 0.017985 0.575597
vt 0.260057 0.797294
vt 0.165510 0.797294
vt 0.423070 0.634281
vt 0.017986 0.858219
vt 0.017986 0.851981
vt 0.344029 0.851991
vt 0.017986 0.845742
vt 0.344029 0.845753
vt 0.017986 0.839503
vt 0.344029 0.839516
vt 0.017986 0.833265
vt 0.344030 0.833279
vt 0.017985 0.883174
vt 0.017985 0.876935
vt 0.344029 0.876939
vt 0.017985 0.870696
vt 0.344029 0.870702
vt 0.468077 0.897383
vt 0.468077 0.893640
vt 0.647390 0.893639
vt 0.017986 0.864458
vt 0.344029 0.858228
vt 0.344029 0.864465
vt 0.468077 0.889897
vt 0.647390 0.889896
vt 0.468077 0.886154
vt 0.647389 0.886153
vt 0.468077 0.882411
vt 0.647389 0.882410
vt 0.468077 0.912355
vt 0.468077 0.908612
vt 0.647390 0.908611
vt 0.468077 0.904869
vt 0.468077 0.901126
vt 0.647390 0.897382
vt 0.647390 0.901125
vt 0.465430 0.879764
vt 0.465430 0.888801
vt 0.902544 0.741978
vt 0.902544 0.807183
vt 0.804736 0.807183
vt 0.902544 0.709376
vt 0.967748 0.709375
vt 0.967748 0.741978
vt 0.804736 0.709375
vt 0.804736 0.644170
vt 0.902544 0.644171
vt 0.804736 0.741978
vt 0.739530 0.741978
vt 0.739530 0.709375
vt 0.902544 0.839786
vt 0.804736 0.839786
vt 0.889503 0.724047
vt 0.740128 0.942905
vt 0.739889 0.929866
vt 0.748650 0.929785
vt 0.889503 0.711006
vt 0.850380 0.711006
vt 0.850380 0.724047
vt 0.750328 0.890466
vt 0.759089 0.890386
vt 0.759447 0.929507
vt 0.739530 0.877703
vt 0.750331 0.877784
vt 0.748291 0.890664
vt 0.739530 0.890744
vt 0.750925 0.942626
vt 0.751933 0.981737
vt 0.761723 0.942348
vt 0.772520 0.942070
vt 0.773528 0.981180
vt 0.762731 0.981458
vt 0.750686 0.929588
vt 0.750328 0.877425
vt 0.761129 0.877505
vt 0.772281 0.929031
vt 0.781042 0.928951
vt 0.761484 0.929309
vt 0.770245 0.929229
vt 0.761125 0.877147
vt 0.771926 0.877227
vt 0.769886 0.890108
vt 0.761125 0.890188
vt 0.790639 0.890232
vt 0.797118 0.891373
vt 0.790333 0.929903
vt 0.771923 0.876869
vt 0.782724 0.876949
vt 0.780684 0.889829
vt 0.771923 0.889910
vt 0.783318 0.941792
vt 0.784326 0.980902
vt 0.796384 0.941455
vt 0.796683 0.928418
vt 0.803692 0.929189
vt 0.797391 0.980565
vt 0.783854 0.928762
vt 0.794586 0.877802
vt 0.806751 0.882582
vt 0.820199 0.877142
vt 0.832364 0.881922
vt 0.822731 0.890713
vt 0.803510 0.876739
vt 0.815687 0.879785
vt 0.807975 0.890301
vt 0.800965 0.889530
vt 0.808931 0.941132
vt 0.809939 0.980242
vt 0.826578 0.888870
vt 0.833588 0.889642
vt 0.829305 0.928530
vt 0.816252 0.889572
vt 0.815946 0.929243
vt 0.821997 0.940795
vt 0.823005 0.979905
vt 0.809467 0.928102
vt 0.834544 0.940472
vt 0.834843 0.927434
vt 0.841852 0.928206
vt 0.835552 0.979582
vt 0.822296 0.927758
vt 0.829123 0.876079
vt 0.841300 0.879125
vt 0.805844 0.229902
vt 0.805844 0.132094
vt 0.822146 0.132094
vt 0.841671 0.875756
vt 0.853847 0.878802
vt 0.846135 0.889318
vt 0.839126 0.888546
vt 0.847091 0.940149
vt 0.848099 0.979259
vt 0.952556 0.017985
vt 0.952556 0.115793
vt 0.822146 0.115793
vt 0.952556 0.229902
vt 0.952556 0.132094
vt 0.968857 0.132094
vt 0.822146 0.229902
vt 0.952556 0.246203
vt 0.822146 0.246203
vt 0.703560 0.494090
vt 0.703560 0.412584
vt 0.866573 0.412584
vt 0.703560 0.526693
vt 0.622054 0.526693
vt 0.622054 0.494090
vt 0.866573 0.526693
vt 0.866573 0.608199
vt 0.703560 0.608199
vt 0.866573 0.494090
vt 0.948079 0.494090
vt 0.948079 0.526693
vt 0.459041 0.526693
vt 0.703560 0.793888
vt 0.703560 0.818841
vt 0.459041 0.818841
vt 0.703560 0.843794
vt 0.459041 0.843794
vt 0.703560 0.644170
vt 0.703560 0.669123
vt 0.459041 0.669123
vt 0.703560 0.694076
vt 0.459041 0.694076
vt 0.703560 0.719029
vt 0.459041 0.719029
vt 0.703560 0.743982
vt 0.459041 0.743982
vt 0.703560 0.768935
vt 0.459041 0.793888
vt 0.459041 0.768935
vt 0.769874 0.246204
vt 0.148395 0.376613
vt 0.165510 0.412584
vt 0.017985 0.634281
vt 0.423070 0.575597
vt 0.344029 0.883176
vt 0.647390 0.912354
vt 0.647390 0.904868
vt 0.461687 0.888801
vt 0.459041 0.886154
vt 0.459041 0.882411
vt 0.461687 0.879765
vt 0.741136 0.982015
vt 0.822146 0.017985
vt 0.968857 0.229902
vt 0.459041 0.494090
vt 0.459041 0.644170
vn 0.000000 1.000000 0.000000
vn 0.000000 -0.992300 -0.124000
vn -0.000000 0.000000 1.000000
@ -173,199 +383,199 @@ vn -0.000000 0.382700 -0.923900
vn -0.000000 0.923900 -0.382700
vn 0.556100 0.831100 0.000000
s off
f 1//1 5//1 7//1
f 6//2 2//2 4//2
f 3//3 11//3 10//3
f 3//4 4//4 2//4
f 1//5 2//5 6//5
f 7//6 5//6 6//6
f 11//4 15//4 14//4
f 7//3 12//3 11//3
f 4//3 10//3 9//3
f 7//3 8//3 9//3
f 16//3 13//3 14//3
f 10//7 14//7 13//7
f 12//6 9//6 13//6
f 12//1 16//1 15//1
f 18//8 20//8 19//8
f 20//9 22//9 21//9
f 22//10 24//10 23//10
f 24//11 26//11 25//11
f 26//12 28//12 27//12
f 28//13 30//13 29//13
f 34//8 36//8 35//8
f 32//14 18//14 17//14
f 30//15 32//15 31//15
f 36//9 38//9 37//9
f 38//10 40//10 39//10
f 40//11 42//11 41//11
f 42//12 44//12 43//12
f 43//13 44//13 46//13
f 48//14 34//14 33//14
f 46//15 48//15 47//15
f 44//3 42//3 38//3
f 52//6 51//6 49//6
f 56//5 55//5 51//5
f 54//4 53//4 55//4
f 50//3 49//3 53//3
f 51//16 55//16 53//16
f 56//1 52//1 58//1
f 57//3 60//3 64//3
f 56//1 59//1 60//1
f 52//1 50//1 57//1
f 54//1 60//1 57//1
f 63//17 67//17 68//17
f 58//5 62//5 63//5
f 59//18 63//18 64//18
f 57//19 61//19 62//19
f 65//20 69//20 70//20
f 61//21 65//21 66//21
f 61//3 64//3 68//3
f 62//5 66//5 67//5
f 69//3 72//3 76//3
f 65//3 68//3 72//3
f 66//5 70//5 71//5
f 67//22 71//22 72//22
f 75//23 79//23 80//23
f 70//5 74//5 75//5
f 71//24 75//24 76//24
f 69//25 73//25 74//25
f 77//3 80//3 84//3
f 73//26 77//26 78//26
f 73//3 76//3 80//3
f 74//5 78//5 79//5
f 82//5 86//5 87//5
f 78//5 82//5 83//5
f 79//27 83//27 84//27
f 77//28 81//28 82//28
f 87//29 91//29 92//29
f 83//30 87//30 88//30
f 81//31 85//31 86//31
f 81//3 84//3 88//3
f 89//3 92//3 96//3
f 85//32 89//32 90//32
f 85//3 88//3 92//3
f 86//5 90//5 91//5
f 100//6 99//6 97//6
f 90//5 94//5 95//5
f 91//33 95//33 96//33
f 89//34 93//34 94//34
f 104//5 103//5 99//5
f 102//4 101//4 103//4
f 98//3 97//3 101//3
f 99//16 103//16 101//16
f 104//1 100//1 98//1
f 108//6 107//6 105//6
f 112//5 111//5 107//5
f 110//4 109//4 111//4
f 106//3 105//3 109//3
f 107//16 111//16 109//16
f 112//1 108//1 106//1
f 114//35 116//35 115//35
f 116//36 118//36 117//36
f 118//37 120//37 119//37
f 120//38 122//38 121//38
f 122//39 124//39 123//39
f 124//40 126//40 125//40
f 128//41 114//41 113//41
f 126//42 128//42 127//42
f 3//1 1//1 7//1
f 8//2 6//2 4//2
f 4//3 3//3 10//3
f 1//4 3//4 2//4
f 5//5 1//5 6//5
f 8//6 7//6 6//6
f 10//4 11//4 14//4
f 3//3 7//3 11//3
f 8//3 4//3 9//3
f 12//3 7//3 9//3
f 15//3 16//3 14//3
f 9//7 10//7 13//7
f 16//6 12//6 13//6
f 11//1 12//1 15//1
f 17//8 18//8 19//8
f 19//9 20//9 21//9
f 21//10 22//10 23//10
f 23//11 24//11 25//11
f 25//12 26//12 27//12
f 27//13 28//13 29//13
f 33//8 34//8 35//8
f 31//14 32//14 17//14
f 29//15 30//15 31//15
f 35//9 36//9 37//9
f 37//10 38//10 39//10
f 39//11 40//11 41//11
f 41//12 42//12 43//12
f 45//13 43//13 46//13
f 47//14 48//14 33//14
f 45//15 46//15 47//15
f 38//3 36//3 34//3
f 34//3 48//3 38//3
f 46//3 44//3 38//3
f 42//3 40//3 38//3
f 38//3 48//3 46//3
f 50//6 52//6 49//6
f 52//5 56//5 51//5
f 56//4 54//4 55//4
f 54//3 50//3 53//3
f 49//16 51//16 53//16
f 59//1 56//1 58//1
f 61//3 57//3 64//3
f 54//1 56//1 60//1
f 58//1 52//1 57//1
f 50//1 54//1 57//1
f 64//17 63//17 68//17
f 59//5 58//5 63//5
f 60//18 59//18 64//18
f 58//19 57//19 62//19
f 66//20 65//20 70//20
f 62//21 61//21 66//21
f 65//3 61//3 68//3
f 63//5 62//5 67//5
f 73//3 69//3 76//3
f 69//3 65//3 72//3
f 67//5 66//5 71//5
f 68//22 67//22 72//22
f 76//23 75//23 80//23
f 71//5 70//5 75//5
f 72//24 71//24 76//24
f 70//25 69//25 74//25
f 81//3 77//3 84//3
f 74//26 73//26 78//26
f 77//3 73//3 80//3
f 75//5 74//5 79//5
f 83//5 82//5 87//5
f 79//5 78//5 83//5
f 80//27 79//27 84//27
f 78//28 77//28 82//28
f 88//29 87//29 92//29
f 84//30 83//30 88//30
f 82//31 81//31 86//31
f 85//3 81//3 88//3
f 93//3 89//3 96//3
f 86//43 85//43 90//43
f 89//3 85//3 92//3
f 87//5 86//5 91//5
f 98//6 100//6 97//6
f 91//5 90//5 95//5
f 92//33 91//33 96//33
f 90//34 89//34 94//34
f 100//5 104//5 99//5
f 104//4 102//4 103//4
f 102//3 98//3 101//3
f 97//16 99//16 101//16
f 102//1 104//1 98//1
f 106//6 108//6 105//6
f 108//5 112//5 107//5
f 112//4 110//4 111//4
f 110//3 106//3 109//3
f 105//16 107//16 109//16
f 110//1 112//1 106//1
f 113//35 114//35 115//35
f 115//36 116//36 117//36
f 117//37 118//37 119//37
f 119//38 120//38 121//38
f 121//39 122//39 123//39
f 123//40 124//40 125//40
f 127//41 128//41 113//41
f 125//42 126//42 127//42
f 1/1/1 5/2/1 7/3/1
f 6/4/2 2/5/2 4/6/2
f 3/7/3 11/8/3 10/9/3
f 3/7/4 4/10/4 2/11/4
f 1/1/5 2/5/5 6/4/5
f 7/3/6 5/2/6 6/12/6
f 11/13/4 15/14/4 14/15/4
f 7/3/3 12/16/3 11/8/3
f 4/17/3 10/9/3 9/18/3
f 7/3/3 8/19/3 9/18/3
f 16/20/3 13/21/3 14/15/3
f 10/22/7 14/15/7 13/21/7
f 12/23/6 9/24/6 13/21/6
f 12/25/1 16/20/1 15/14/1
f 18/26/8 20/27/8 19/28/8
f 20/27/9 22/29/9 21/30/9
f 22/29/10 24/31/10 23/32/10
f 24/31/11 26/33/11 25/34/11
f 26/35/12 28/36/12 27/37/12
f 28/36/13 30/38/13 29/39/13
f 34/40/8 36/41/8 35/42/8
f 32/43/14 18/26/14 17/44/14
f 30/38/15 32/43/15 31/45/15
f 36/41/9 38/46/9 37/47/9
f 38/46/10 40/48/10 39/49/10
f 40/48/11 42/50/11 41/51/11
f 42/52/12 44/53/12 43/54/12
f 43/54/13 44/53/13 46/55/13
f 48/56/14 34/40/14 33/57/14
f 46/55/15 48/56/15 47/58/15
f 44/59/3 42/50/3 38/60/3
f 52/61/6 51/62/6 49/63/6
f 56/64/5 55/65/5 51/66/5
f 54/67/4 53/68/4 55/69/4
f 50/70/3 49/71/3 53/72/3
f 51/62/16 55/73/16 53/74/16
f 56/64/1 52/61/1 58/75/1
f 57/76/3 60/77/3 64/78/3
f 56/64/1 59/79/1 60/80/1
f 52/61/1 50/70/1 57/81/1
f 54/67/1 60/80/1 57/81/1
f 63/82/17 67/83/17 68/84/17
f 58/85/5 62/86/5 63/87/5
f 59/88/18 63/87/18 64/78/18
f 57/76/19 61/89/19 62/90/19
f 65/91/20 69/92/20 70/93/20
f 61/89/21 65/91/21 66/94/21
f 61/89/3 64/95/3 68/84/3
f 62/96/5 66/97/5 67/83/5
f 69/92/3 72/98/3 76/99/3
f 65/91/3 68/100/3 72/101/3
f 66/102/5 70/103/5 71/104/5
f 67/105/22 71/104/22 72/101/22
f 75/106/23 79/107/23 80/108/23
f 70/109/5 74/110/5 75/111/5
f 71/112/24 75/111/24 76/99/24
f 69/92/25 73/113/25 74/114/25
f 77/115/3 80/116/3 84/117/3
f 73/113/26 77/115/26 78/118/26
f 73/113/3 76/119/3 80/108/3
f 74/120/5 78/121/5 79/107/5
f 82/122/5 86/123/5 87/124/5
f 78/125/5 82/126/5 83/127/5
f 79/128/27 83/127/27 84/117/27
f 77/115/28 81/129/28 82/130/28
f 87/131/29 91/132/29 92/133/29
f 83/134/30 87/124/30 88/135/30
f 81/129/31 85/136/31 86/137/31
f 81/129/3 84/138/3 88/135/3
f 89/139/3 92/140/3 96/141/3
f 85/136/32 89/139/32 90/142/32
f 85/136/3 88/143/3 92/133/3
f 86/144/5 90/145/5 91/132/5
f 100/146/6 99/147/6 97/148/6
f 90/149/5 94/150/5 95/151/5
f 91/152/33 95/151/33 96/141/33
f 89/139/34 93/153/34 94/154/34
f 104/155/5 103/156/5 99/157/5
f 102/158/4 101/159/4 103/160/4
f 98/161/3 97/148/3 101/159/3
f 99/157/16 103/156/16 101/159/16
f 104/162/1 100/163/1 98/161/1
f 108/164/6 107/165/6 105/166/6
f 112/167/5 111/168/5 107/169/5
f 110/170/4 109/171/4 111/172/4
f 106/173/3 105/174/3 109/175/3
f 107/169/16 111/168/16 109/176/16
f 112/167/1 108/164/1 106/173/1
f 114/177/35 116/178/35 115/179/35
f 116/178/36 118/180/36 117/181/36
f 118/182/37 120/183/37 119/184/37
f 120/183/38 122/185/38 121/186/38
f 122/185/39 124/187/39 123/188/39
f 124/187/40 126/189/40 125/190/40
f 128/191/41 114/177/41 113/192/41
f 126/189/42 128/191/42 127/193/42
f 3/7/1 1/1/1 7/3/1
f 8/194/2 6/4/2 4/6/2
f 4/17/3 3/7/3 10/9/3
f 1/1/4 3/7/4 2/11/4
f 5/2/5 1/1/5 6/4/5
f 8/195/6 7/3/6 6/12/6
f 10/196/4 11/13/4 14/15/4
f 3/7/3 7/3/3 11/8/3
f 8/19/3 4/17/3 9/18/3
f 12/16/3 7/3/3 9/18/3
f 15/14/3 16/20/3 14/15/3
f 9/197/7 10/22/7 13/21/7
f 16/20/6 12/23/6 13/21/6
f 11/198/1 12/25/1 15/14/1
f 17/44/8 18/26/8 19/28/8
f 19/28/9 20/27/9 21/30/9
f 21/30/10 22/29/10 23/32/10
f 23/32/11 24/31/11 25/34/11
f 25/199/12 26/35/12 27/37/12
f 27/37/13 28/36/13 29/39/13
f 33/57/8 34/40/8 35/42/8
f 31/45/14 32/43/14 17/44/14
f 29/39/15 30/38/15 31/45/15
f 35/42/9 36/41/9 37/47/9
f 37/47/10 38/46/10 39/49/10
f 39/49/11 40/48/11 41/51/11
f 41/200/12 42/52/12 43/54/12
f 45/201/13 43/54/13 46/55/13
f 47/58/14 48/56/14 33/57/14
f 45/201/15 46/55/15 47/58/15
f 38/60/3 36/202/3 34/203/3
f 34/203/3 48/204/3 38/60/3
f 46/205/3 44/59/3 38/60/3
f 42/50/3 40/48/3 38/60/3
f 38/60/3 48/204/3 46/205/3
f 50/70/6 52/61/6 49/63/6
f 52/61/5 56/64/5 51/66/5
f 56/64/4 54/67/4 55/69/4
f 54/67/3 50/70/3 53/72/3
f 49/63/16 51/62/16 53/74/16
f 59/79/1 56/64/1 58/75/1
f 61/89/3 57/76/3 64/78/3
f 54/67/1 56/64/1 60/80/1
f 58/75/1 52/61/1 57/81/1
f 50/70/1 54/67/1 57/81/1
f 64/95/17 63/82/17 68/84/17
f 59/88/5 58/85/5 63/87/5
f 60/77/18 59/88/18 64/78/18
f 58/206/19 57/76/19 62/90/19
f 66/94/20 65/91/20 70/93/20
f 62/90/21 61/89/21 66/94/21
f 65/91/3 61/89/3 68/84/3
f 63/82/5 62/96/5 67/83/5
f 73/113/3 69/92/3 76/99/3
f 69/92/3 65/91/3 72/101/3
f 67/105/5 66/102/5 71/104/5
f 68/100/22 67/105/22 72/101/22
f 76/119/23 75/106/23 80/108/23
f 71/112/5 70/109/5 75/111/5
f 72/98/24 71/112/24 76/99/24
f 70/93/25 69/92/25 74/114/25
f 81/129/3 77/115/3 84/117/3
f 74/114/26 73/113/26 78/118/26
f 77/115/3 73/113/3 80/108/3
f 75/106/5 74/120/5 79/107/5
f 83/134/5 82/122/5 87/124/5
f 79/128/5 78/125/5 83/127/5
f 80/116/27 79/128/27 84/117/27
f 78/118/28 77/115/28 82/130/28
f 88/143/29 87/131/29 92/133/29
f 84/138/30 83/134/30 88/135/30
f 82/130/31 81/129/31 86/137/31
f 85/136/3 81/129/3 88/135/3
f 93/153/3 89/139/3 96/141/3
f 86/137/43 85/136/43 90/142/43
f 89/139/3 85/136/3 92/133/3
f 87/131/5 86/144/5 91/132/5
f 98/161/6 100/146/6 97/148/6
f 91/152/5 90/149/5 95/151/5
f 92/140/33 91/152/33 96/141/33
f 90/142/34 89/139/34 94/154/34
f 100/207/5 104/155/5 99/157/5
f 104/208/4 102/158/4 103/160/4
f 102/158/3 98/161/3 101/159/3
f 97/148/16 99/157/16 101/159/16
f 102/158/1 104/162/1 98/161/1
f 106/173/6 108/164/6 105/166/6
f 108/164/5 112/167/5 107/169/5
f 112/167/4 110/170/4 111/172/4
f 110/170/3 106/173/3 109/175/3
f 105/209/16 107/169/16 109/176/16
f 110/170/1 112/167/1 106/173/1
f 113/192/35 114/177/35 115/179/35
f 115/179/36 116/178/36 117/181/36
f 117/210/37 118/182/37 119/184/37
f 119/184/38 120/183/38 121/186/38
f 121/186/39 122/185/39 123/188/39
f 123/188/40 124/187/40 125/190/40
f 127/193/41 128/191/41 113/192/41
f 125/190/42 126/189/42 127/193/42

View File

@ -115,6 +115,215 @@ v 0.250000 0.330000 -0.131250
v 0.250000 -0.080000 -0.131250
v 0.250000 0.330000 0.131250
v 0.250000 -0.080000 0.131250
vt 0.546756 0.160984
vt 0.546756 0.238616
vt 0.024234 0.238615
vt 0.546756 0.053793
vt 0.024235 0.053793
vt 0.024235 0.024234
vt 0.024235 0.131425
vt 0.546756 0.131425
vt 0.546756 0.268174
vt 0.024234 0.268174
vt 0.024234 0.345806
vt 0.546756 0.345806
vt 0.546756 0.375365
vt 0.587914 0.572912
vt 0.289294 0.572912
vt 0.289295 0.558627
vt 0.587914 0.587197
vt 0.289294 0.587196
vt 0.587914 0.601481
vt 0.289294 0.601481
vt 0.587914 0.615766
vt 0.289294 0.615765
vt 0.587914 0.515774
vt 0.289295 0.515773
vt 0.289295 0.501489
vt 0.587914 0.530058
vt 0.289295 0.530058
vt 0.587914 0.558627
vt 0.289295 0.544342
vt 0.587914 0.544343
vt 0.598015 0.625867
vt 0.598015 0.591380
vt 0.612299 0.591381
vt 0.895198 0.268504
vt 0.596579 0.268503
vt 0.596579 0.254219
vt 0.895198 0.282788
vt 0.596579 0.282788
vt 0.895198 0.297073
vt 0.596579 0.297072
vt 0.895198 0.311358
vt 0.596579 0.311357
vt 0.895198 0.211365
vt 0.596579 0.211365
vt 0.596579 0.197081
vt 0.895198 0.225650
vt 0.596579 0.225650
vt 0.895198 0.254219
vt 0.596579 0.239934
vt 0.895198 0.239934
vt 0.905299 0.321458
vt 0.905299 0.286972
vt 0.919584 0.286972
vt 0.895199 0.095657
vt 0.596579 0.095657
vt 0.596579 0.081372
vt 0.895198 0.109942
vt 0.596579 0.109941
vt 0.895198 0.124227
vt 0.596579 0.124226
vt 0.895198 0.138511
vt 0.596579 0.138510
vt 0.895199 0.038519
vt 0.596579 0.038519
vt 0.596579 0.024234
vt 0.895199 0.052804
vt 0.596579 0.052803
vt 0.895199 0.081373
vt 0.596579 0.067088
vt 0.895199 0.067088
vt 0.905299 0.148612
vt 0.905299 0.114126
vt 0.919584 0.114126
vt 0.587914 0.745758
vt 0.289294 0.745758
vt 0.289294 0.731473
vt 0.587914 0.760043
vt 0.289294 0.760042
vt 0.587914 0.774328
vt 0.289294 0.774327
vt 0.587914 0.788612
vt 0.289294 0.788611
vt 0.587914 0.688620
vt 0.289295 0.688620
vt 0.289295 0.674335
vt 0.587914 0.702904
vt 0.289295 0.702904
vt 0.587914 0.731474
vt 0.289295 0.717189
vt 0.587914 0.717189
vt 0.598014 0.798713
vt 0.598015 0.764227
vt 0.612299 0.764227
vt 0.740550 0.815492
vt 0.727353 0.820958
vt 0.722074 0.815679
vt 0.759026 0.789285
vt 0.753560 0.802482
vt 0.740550 0.789472
vt 0.759026 0.815679
vt 0.753747 0.820958
vt 0.727540 0.802482
vt 0.722074 0.789285
vt 0.727353 0.784006
vt 0.721886 0.770809
vt 0.772223 0.783818
vt 0.753747 0.784006
vt 0.772223 0.821146
vt 0.759214 0.834155
vt 0.785421 0.815679
vt 0.755331 0.872163
vt 0.753747 0.847353
vt 0.790887 0.802482
vt 0.810231 0.817263
vt 0.810231 0.787701
vt 0.785421 0.789285
vt 0.759214 0.770809
vt 0.753747 0.757611
vt 0.740550 0.752145
vt 0.755331 0.732800
vt 0.725769 0.732800
vt 0.727353 0.757611
vt 0.721886 0.834155
vt 0.708877 0.821146
vt 0.727353 0.847353
vt 0.740550 0.852819
vt 0.725769 0.872163
vt 0.670869 0.817263
vt 0.695679 0.815679
vt 0.690213 0.802482
vt 0.670869 0.787701
vt 0.695679 0.789285
vt 0.708877 0.783818
vt 0.114613 0.695591
vt 0.114613 0.606006
vt 0.150447 0.606006
vt 0.024234 0.375364
vt 0.546756 0.453020
vt 0.024234 0.452996
vt 0.150447 0.695591
vt 0.162392 0.787934
vt 0.024234 0.920865
vt 0.046406 0.911363
vt 0.088637 0.953594
vt 0.102668 0.516420
vt 0.162392 0.501489
vt 0.162392 0.516420
vt 0.024234 0.620937
vt 0.024234 0.606006
vt 0.240826 0.620937
vt 0.894833 0.638621
vt 0.894833 0.661476
vt 0.670869 0.661477
vt 0.894833 0.684332
vt 0.670869 0.684332
vt 0.894833 0.501489
vt 0.894833 0.524344
vt 0.670869 0.524344
vt 0.894833 0.547200
vt 0.670869 0.547200
vt 0.894833 0.570055
vt 0.670869 0.570055
vt 0.858700 0.855234
vt 0.858700 0.732800
vt 0.937087 0.732801
vt 0.894833 0.592910
vt 0.670869 0.592910
vt 0.937087 0.855234
vt 0.937087 0.884796
vt 0.894833 0.615766
vt 0.670869 0.638621
vt 0.670869 0.615766
vt 0.937087 0.940041
vt 0.858700 0.940041
vt 0.024234 0.891303
vt 0.079135 0.836403
vt 0.163597 0.920865
vt 0.108697 0.975766
vt 0.024235 0.160983
vt 0.546756 0.024235
vt 0.587914 0.501489
vt 0.622400 0.601481
vt 0.622400 0.615766
vt 0.612299 0.625867
vt 0.895198 0.197081
vt 0.929685 0.297073
vt 0.929685 0.311358
vt 0.919584 0.321458
vt 0.895199 0.024234
vt 0.929685 0.124227
vt 0.929685 0.138511
vt 0.919584 0.148612
vt 0.587914 0.674335
vt 0.622400 0.774328
vt 0.622400 0.788612
vt 0.612299 0.798713
vt 0.548110 0.452986
vt 0.102668 0.787934
vt 0.079135 0.975766
vt 0.102668 0.501489
vt 0.024234 0.717988
vt 0.240826 0.606006
vt 0.240826 0.717988
vt 0.670869 0.501489
vt 0.858700 0.884796
vt 0.108697 0.836403
vt 0.115031 0.842738
vt 0.157262 0.884969
vt 0.163597 0.891303
vn 0.000000 1.000000 0.000000
vn 0.707100 -0.707100 0.000000
vn 0.707100 0.707100 0.000000
@ -132,7 +341,7 @@ vn 0.382700 -0.923900 0.000000
vn 0.923900 -0.382700 0.000000
vn 0.000000 0.000000 1.000000
vn 0.000000 0.000000 -1.000000
vn 0.000000 -1.000000 0.000000
vn 0.000000 -1.000000 -0.000000
vn 0.000000 0.970100 -0.242500
vn 0.991200 0.000000 -0.132200
vn -0.991200 0.000000 -0.132200
@ -145,203 +354,201 @@ vn -0.000000 0.923900 0.382700
vn -0.000000 0.382700 -0.923900
vn -0.000000 0.923900 -0.382700
s off
f 1//1 5//1 7//1
f 10//2 12//2 4//2
f 11//3 9//3 1//3
f 13//4 15//4 7//4
f 11//5 12//5 10//5
f 16//6 14//6 6//6
f 13//7 14//7 16//7
f 19//8 20//8 18//8
f 21//9 22//9 20//9
f 23//10 24//10 22//10
f 25//11 26//11 24//11
f 27//12 28//12 26//12
f 29//13 30//13 28//13
f 17//14 18//14 32//14
f 31//15 32//15 30//15
f 27//16 21//16 19//16
f 35//8 36//8 34//8
f 37//9 38//9 36//9
f 39//10 40//10 38//10
f 41//11 42//11 40//11
f 43//12 44//12 42//12
f 45//13 46//13 44//13
f 33//14 34//14 48//14
f 47//15 48//15 46//15
f 43//16 37//16 35//16
f 51//8 52//8 50//8
f 53//9 54//9 52//9
f 55//10 56//10 54//10
f 57//11 58//11 56//11
f 59//12 60//12 58//12
f 61//13 62//13 60//13
f 49//14 50//14 64//14
f 63//15 64//15 62//15
f 59//16 53//16 51//16
f 67//8 68//8 66//8
f 69//9 70//9 68//9
f 71//10 72//10 70//10
f 73//11 74//11 72//11
f 75//12 76//12 74//12
f 77//13 78//13 76//13
f 65//14 66//14 80//14
f 79//15 80//15 78//15
f 75//16 69//16 67//16
f 56//16 58//16 18//16
f 74//16 76//16 48//16
f 76//16 78//16 54//16
f 56//16 20//16 48//16
f 22//16 46//16 48//16
f 44//16 46//16 22//16
f 72//16 74//16 34//16
f 54//16 78//16 80//16
f 52//16 80//16 66//16
f 7//16 50//16 66//16
f 66//16 68//16 3//16
f 3//16 68//16 11//16
f 68//16 70//16 11//16
f 70//16 72//16 36//16
f 11//16 70//16 38//16
f 38//16 40//16 12//16
f 12//16 40//16 4//16
f 40//16 42//16 4//16
f 58//16 60//16 32//16
f 32//16 60//16 62//16
f 50//16 7//16 64//16
f 7//16 15//16 64//16
f 64//16 15//16 62//16
f 15//16 16//16 30//16
f 30//16 16//16 28//16
f 16//16 8//16 28//16
f 28//16 8//16 26//16
f 42//16 44//16 24//16
f 42//16 26//16 8//16
f 86//17 90//17 89//17
f 6//18 81//18 8//18
f 81//17 14//17 82//17
f 86//19 83//19 82//19
f 84//17 85//17 10//17
f 1//17 85//17 82//17
f 89//18 90//18 88//18
f 81//16 87//16 88//16
f 84//20 88//20 90//20
f 83//21 89//21 81//21
f 94//22 96//22 95//22
f 96//23 98//23 97//23
f 98//24 100//24 99//24
f 100//25 102//25 101//25
f 102//26 104//26 103//26
f 113//5 114//5 112//5
f 104//27 106//27 105//27
f 113//3 111//3 92//3
f 108//28 94//28 93//28
f 106//29 108//29 107//29
f 92//1 109//1 110//1
f 3//1 1//1 7//1
f 2//2 10//2 4//2
f 3//3 11//3 1//3
f 5//4 13//4 7//4
f 9//5 11//5 10//5
f 8//6 16//6 6//6
f 15//7 13//7 16//7
f 17//8 19//8 18//8
f 19//9 21//9 20//9
f 21//10 23//10 22//10
f 23//11 25//11 24//11
f 25//12 27//12 26//12
f 27//13 29//13 28//13
f 31//14 17//14 32//14
f 29//15 31//15 30//15
f 19//16 17//16 27//16
f 31//16 29//16 27//16
f 27//16 25//16 23//16
f 23//16 21//16 27//16
f 17//16 31//16 27//16
f 33//8 35//8 34//8
f 35//9 37//9 36//9
f 37//10 39//10 38//10
f 39//11 41//11 40//11
f 41//12 43//12 42//12
f 43//13 45//13 44//13
f 47//14 33//14 48//14
f 45//15 47//15 46//15
f 35//16 33//16 43//16
f 47//16 45//16 43//16
f 43//16 41//16 39//16
f 39//16 37//16 43//16
f 33//16 47//16 43//16
f 49//8 51//8 50//8
f 51//9 53//9 52//9
f 53//10 55//10 54//10
f 55//11 57//11 56//11
f 57//12 59//12 58//12
f 59//13 61//13 60//13
f 63//14 49//14 64//14
f 61//15 63//15 62//15
f 51//16 49//16 59//16
f 63//16 61//16 59//16
f 59//16 57//16 55//16
f 55//16 53//16 59//16
f 49//16 63//16 59//16
f 65//8 67//8 66//8
f 67//9 69//9 68//9
f 69//10 71//10 70//10
f 71//11 73//11 72//11
f 73//12 75//12 74//12
f 75//13 77//13 76//13
f 79//14 65//14 80//14
f 77//15 79//15 78//15
f 67//16 65//16 75//16
f 79//16 77//16 75//16
f 75//16 73//16 71//16
f 71//16 69//16 75//16
f 65//16 79//16 75//16
f 20//16 56//16 18//16
f 34//16 74//16 48//16
f 56//16 76//16 54//16
f 76//16 56//16 48//16
f 20//16 22//16 48//16
f 24//16 44//16 22//16
f 36//16 72//16 34//16
f 52//16 54//16 80//16
f 50//16 52//16 66//16
f 3//16 7//16 66//16
f 38//16 70//16 36//16
f 12//16 11//16 38//16
f 18//16 58//16 32//16
f 30//16 32//16 62//16
f 62//16 15//16 30//16
f 26//16 42//16 24//16
f 4//16 42//16 8//16
f 83//17 86//17 89//17
f 4//18 8//18 81//18
f 6//16 84//16 81//16
f 81//18 2//18 4//18
f 81//16 84//16 6//16
f 5//17 82//17 13//17
f 14//17 13//17 82//17
f 81//17 6//17 14//17
f 85//19 86//19 82//19
f 2//16 81//16 84//16
f 9//17 10//17 85//17
f 85//17 1//17 9//17
f 2//17 84//17 10//17
f 5//17 1//17 82//17
f 87//18 89//18 88//18
f 84//16 81//16 88//16
f 90//20 86//20 84//20
f 85//20 84//20 86//20
f 87//21 81//21 89//21
f 82//21 83//21 81//21
f 93//22 94//22 95//22
f 95//23 96//23 97//23
f 97//24 98//24 99//24
f 99//25 100//25 101//25
f 101//26 102//26 103//26
f 111//5 113//5 112//5
f 103//27 104//27 105//27
f 91//3 113//3 92//3
f 107//28 108//28 93//28
f 105//29 106//29 107//29
f 91//1 92//1 110//1
f 1/1/1 5/2/1 7/3/1
f 10/4/2 12/5/2 4/6/2
f 11/7/3 9/8/3 1/1/3
f 13/9/4 15/10/4 7/3/4
f 11/7/5 12/5/5 10/4/5
f 16/11/6 14/12/6 6/13/6
f 13/9/7 14/12/7 16/11/7
f 19/14/8 20/15/8 18/16/8
f 21/17/9 22/18/9 20/15/9
f 23/19/10 24/20/10 22/18/10
f 25/21/11 26/22/11 24/20/11
f 27/23/12 28/24/12 26/25/12
f 29/26/13 30/27/13 28/24/13
f 17/28/14 18/16/14 32/29/14
f 31/30/15 32/29/15 30/27/15
f 27/31/16 21/32/16 19/33/16
f 35/34/8 36/35/8 34/36/8
f 37/37/9 38/38/9 36/35/9
f 39/39/10 40/40/10 38/38/10
f 41/41/11 42/42/11 40/40/11
f 43/43/12 44/44/12 42/45/12
f 45/46/13 46/47/13 44/44/13
f 33/48/14 34/36/14 48/49/14
f 47/50/15 48/49/15 46/47/15
f 43/51/16 37/52/16 35/53/16
f 51/54/8 52/55/8 50/56/8
f 53/57/9 54/58/9 52/55/9
f 55/59/10 56/60/10 54/58/10
f 57/61/11 58/62/11 56/60/11
f 59/63/12 60/64/12 58/65/12
f 61/66/13 62/67/13 60/64/13
f 49/68/14 50/56/14 64/69/14
f 63/70/15 64/69/15 62/67/15
f 59/71/16 53/72/16 51/73/16
f 67/74/8 68/75/8 66/76/8
f 69/77/9 70/78/9 68/75/9
f 71/79/10 72/80/10 70/78/10
f 73/81/11 74/82/11 72/80/11
f 75/83/12 76/84/12 74/85/12
f 77/86/13 78/87/13 76/84/13
f 65/88/14 66/76/14 80/89/14
f 79/90/15 80/89/15 78/87/15
f 75/91/16 69/92/16 67/93/16
f 56/94/16 58/95/16 18/96/16
f 74/97/16 76/98/16 48/99/16
f 76/98/16 78/100/16 54/101/16
f 56/94/16 20/102/16 48/99/16
f 22/103/16 46/104/16 48/99/16
f 44/105/16 46/104/16 22/103/16
f 72/106/16 74/97/16 34/107/16
f 54/101/16 78/100/16 80/108/16
f 52/109/16 80/108/16 66/110/16
f 7/111/16 50/112/16 66/110/16
f 66/110/16 68/113/16 3/114/16
f 3/114/16 68/113/16 11/115/16
f 68/113/16 70/116/16 11/115/16
f 70/116/16 72/106/16 36/117/16
f 11/115/16 70/116/16 38/118/16
f 38/118/16 40/119/16 12/120/16
f 12/120/16 40/119/16 4/121/16
f 40/119/16 42/122/16 4/121/16
f 58/95/16 60/123/16 32/124/16
f 32/124/16 60/123/16 62/125/16
f 50/112/16 7/111/16 64/126/16
f 7/111/16 15/127/16 64/126/16
f 64/126/16 15/127/16 62/125/16
f 15/127/16 16/128/16 30/129/16
f 30/129/16 16/128/16 28/130/16
f 16/128/16 8/131/16 28/130/16
f 28/130/16 8/131/16 26/132/16
f 42/122/16 44/105/16 24/133/16
f 42/122/16 26/132/16 8/131/16
f 86/134/17 90/135/17 89/136/17
f 8/137/18 84/138/18 4/139/18
f 86/134/19 83/140/19 82/141/19
f 1/142/17 85/143/17 82/144/17
f 89/136/18 90/135/18 88/145/18
f 81/146/16 87/147/16 88/145/16
f 84/148/20 88/149/20 90/135/20
f 83/140/21 89/136/21 81/150/21
f 94/151/22 96/152/22 95/153/22
f 96/152/23 98/154/23 97/155/23
f 98/156/24 100/157/24 99/158/24
f 100/157/25 102/159/25 101/160/25
f 102/159/26 104/161/26 103/162/26
f 113/163/5 114/164/5 112/165/5
f 104/161/27 106/166/27 105/167/27
f 113/163/3 111/168/3 92/169/3
f 108/170/28 94/151/28 93/171/28
f 106/166/29 108/170/29 107/172/29
f 92/169/1 109/173/1 110/174/1
f 85/143/17 9/175/17 10/176/17
f 82/144/17 14/177/17 13/178/17
f 3/179/1 1/1/1 7/3/1
f 2/180/2 10/4/2 4/6/2
f 3/179/3 11/7/3 1/1/3
f 5/2/4 13/9/4 7/3/4
f 9/8/5 11/7/5 10/4/5
f 8/137/6 16/11/6 6/13/6
f 15/10/7 13/9/7 16/11/7
f 17/28/8 19/14/8 18/16/8
f 19/14/9 21/17/9 20/15/9
f 21/17/10 23/19/10 22/18/10
f 23/19/11 25/21/11 24/20/11
f 25/181/12 27/23/12 26/25/12
f 27/23/13 29/26/13 28/24/13
f 31/30/14 17/28/14 32/29/14
f 29/26/15 31/30/15 30/27/15
f 19/33/16 17/182/16 27/31/16
f 31/183/16 29/184/16 27/31/16
f 27/31/16 25/21/16 23/19/16
f 23/19/16 21/32/16 27/31/16
f 17/182/16 31/183/16 27/31/16
f 33/48/8 35/34/8 34/36/8
f 35/34/9 37/37/9 36/35/9
f 37/37/10 39/39/10 38/38/10
f 39/39/11 41/41/11 40/40/11
f 41/185/12 43/43/12 42/45/12
f 43/43/13 45/46/13 44/44/13
f 47/50/14 33/48/14 48/49/14
f 45/46/15 47/50/15 46/47/15
f 35/53/16 33/186/16 43/51/16
f 47/187/16 45/188/16 43/51/16
f 43/51/16 41/41/16 39/39/16
f 39/39/16 37/52/16 43/51/16
f 33/186/16 47/187/16 43/51/16
f 49/68/8 51/54/8 50/56/8
f 51/54/9 53/57/9 52/55/9
f 53/57/10 55/59/10 54/58/10
f 55/59/11 57/61/11 56/60/11
f 57/189/12 59/63/12 58/65/12
f 59/63/13 61/66/13 60/64/13
f 63/70/14 49/68/14 64/69/14
f 61/66/15 63/70/15 62/67/15
f 51/73/16 49/190/16 59/71/16
f 63/191/16 61/192/16 59/71/16
f 59/71/16 57/61/16 55/59/16
f 55/59/16 53/72/16 59/71/16
f 49/190/16 63/191/16 59/71/16
f 65/88/8 67/74/8 66/76/8
f 67/74/9 69/77/9 68/75/9
f 69/77/10 71/79/10 70/78/10
f 71/79/11 73/81/11 72/80/11
f 73/193/12 75/83/12 74/85/12
f 75/83/13 77/86/13 76/84/13
f 79/90/14 65/88/14 80/89/14
f 77/86/15 79/90/15 78/87/15
f 67/93/16 65/194/16 75/91/16
f 79/195/16 77/196/16 75/91/16
f 75/91/16 73/81/16 71/79/16
f 71/79/16 69/92/16 75/91/16
f 65/194/16 79/195/16 75/91/16
f 20/102/16 56/94/16 18/96/16
f 34/107/16 74/97/16 48/99/16
f 56/94/16 76/98/16 54/101/16
f 76/98/16 56/94/16 48/99/16
f 20/102/16 22/103/16 48/99/16
f 24/133/16 44/105/16 22/103/16
f 36/117/16 72/106/16 34/107/16
f 52/109/16 54/101/16 80/108/16
f 50/112/16 52/109/16 66/110/16
f 3/114/16 7/111/16 66/110/16
f 38/118/16 70/116/16 36/117/16
f 12/120/16 11/115/16 38/118/16
f 18/96/16 58/95/16 32/124/16
f 30/129/16 32/124/16 62/125/16
f 62/125/16 15/127/16 30/129/16
f 26/132/16 42/122/16 24/133/16
f 4/121/16 42/122/16 8/131/16
f 83/140/17 86/134/17 89/136/17
f 2/138/18 4/139/18 84/138/18
f 8/137/18 6/13/18 81/197/18
f 81/197/18 84/138/18 8/137/18
f 85/198/19 86/134/19 82/141/19
f 5/199/17 1/142/17 82/144/17
f 87/147/18 89/136/18 88/145/18
f 84/200/16 81/146/16 88/145/16
f 90/135/20 86/134/20 84/148/20
f 85/201/20 84/148/20 86/134/20
f 87/202/21 81/150/21 89/136/21
f 82/203/21 83/140/21 81/150/21
f 93/171/22 94/151/22 95/153/22
f 95/153/23 96/152/23 97/155/23
f 97/204/24 98/156/24 99/158/24
f 99/158/25 100/157/25 101/160/25
f 101/160/26 102/159/26 103/162/26
f 111/168/5 113/163/5 112/165/5
f 103/162/27 104/161/27 105/167/27
f 91/205/3 113/163/3 92/169/3
f 107/172/28 108/170/28 93/171/28
f 105/167/29 106/166/29 107/172/29
f 91/205/1 92/169/1 110/174/1
f 10/176/17 2/206/17 84/207/17
f 84/207/17 85/143/17 10/176/17
f 1/142/17 9/175/17 85/143/17
f 13/178/17 5/199/17 82/144/17
f 82/144/17 81/208/17 14/177/17
f 6/209/17 14/177/17 81/208/17

View File

@ -136,6 +136,234 @@ v 0.125000 -0.050000 0.050000
v 0.125000 0.250000 0.050000
v 0.125000 -0.050000 -0.450000
v 0.125000 0.250000 -0.450000
vt 0.671849 0.152564
vt 0.671849 0.281602
vt 0.413772 0.281603
vt 0.023526 0.281603
vt 0.023526 0.152564
vt 0.284734 0.152564
vt 0.284734 0.281603
vt 0.413772 0.152564
vt 0.413772 0.023526
vt 0.671849 0.063850
vt 0.760563 0.152564
vt 0.760563 0.281602
vt 0.671849 0.370316
vt 0.828328 0.500121
vt 0.746833 0.506182
vt 0.746833 0.457692
vt 0.828329 0.597100
vt 0.746834 0.603161
vt 0.746833 0.554672
vt 0.625537 0.677453
vt 0.587672 0.704803
vt 0.586731 0.704392
vt 0.828329 0.742568
vt 0.746834 0.748630
vt 0.746834 0.700140
vt 0.665077 0.748220
vt 0.627212 0.775570
vt 0.828329 0.694079
vt 0.746834 0.651651
vt 0.828329 0.645589
vt 0.665139 0.700704
vt 0.625415 0.676385
vt 0.828328 0.512243
vt 0.828328 0.548610
vt 0.666018 0.700141
vt 0.587610 0.752319
vt 0.586731 0.752882
vt 0.666018 0.748630
vt 0.627334 0.776637
vt 0.674099 0.598312
vt 0.738752 0.598312
vt 0.674099 0.559521
vt 0.666017 0.603161
vt 0.738752 0.559521
vt 0.674099 0.549823
vt 0.738752 0.549823
vt 0.666017 0.506182
vt 0.674099 0.511031
vt 0.738752 0.511031
vt 0.674099 0.501333
vt 0.738752 0.501333
vt 0.674099 0.462541
vt 0.738752 0.462541
vt 0.674100 0.743781
vt 0.738753 0.743781
vt 0.674099 0.704990
vt 0.738752 0.704989
vt 0.674099 0.646802
vt 0.738752 0.646802
vt 0.674099 0.608010
vt 0.738752 0.608010
vt 0.674099 0.695292
vt 0.738752 0.695291
vt 0.674099 0.656500
vt 0.738752 0.656500
vt 0.594796 0.870465
vt 0.594796 0.831754
vt 0.659315 0.831754
vt 0.659315 0.870465
vt 0.659315 0.878530
vt 0.586731 0.831754
vt 0.594796 0.823689
vt 0.667380 0.831754
vt 0.815679 0.278652
vt 0.815679 0.239940
vt 0.880199 0.239940
vt 0.880199 0.278652
vt 0.880199 0.286717
vt 0.807615 0.278652
vt 0.815679 0.231875
vt 0.888264 0.278652
vt 0.722496 0.870465
vt 0.722496 0.831754
vt 0.787015 0.831754
vt 0.787015 0.870465
vt 0.787015 0.878530
vt 0.714431 0.870465
vt 0.722496 0.823689
vt 0.795080 0.831754
vt 0.850197 0.870465
vt 0.850197 0.831754
vt 0.914716 0.831754
vt 0.914716 0.870465
vt 0.914716 0.878530
vt 0.842132 0.870465
vt 0.850197 0.823689
vt 0.922781 0.870465
vt 0.815679 0.380544
vt 0.815679 0.341833
vt 0.880199 0.341833
vt 0.880199 0.380544
vt 0.880199 0.388609
vt 0.807615 0.380544
vt 0.815679 0.333768
vt 0.888264 0.380544
vt 0.922157 0.530276
vt 0.883446 0.530276
vt 0.883446 0.465757
vt 0.922157 0.465757
vt 0.930222 0.465757
vt 0.922157 0.538341
vt 0.875381 0.530276
vt 0.883446 0.457692
vt 0.326493 0.807178
vt 0.326493 0.799113
vt 0.487791 0.799112
vt 0.326493 0.791048
vt 0.487791 0.791048
vt 0.326493 0.782983
vt 0.487791 0.782983
vt 0.326493 0.831372
vt 0.326493 0.823308
vt 0.487791 0.823307
vt 0.312524 0.791048
vt 0.326493 0.815243
vt 0.487791 0.807177
vt 0.487791 0.815242
vt 0.888263 0.088045
vt 0.888263 0.055785
vt 0.912498 0.060510
vt 0.888263 0.023526
vt 0.912498 0.028250
vt 0.875381 0.585393
vt 0.907640 0.585393
vt 0.902916 0.609627
vt 0.888264 0.184824
vt 0.888264 0.152564
vt 0.912498 0.157288
vt 0.888263 0.120305
vt 0.912498 0.125029
vt 0.934396 0.071915
vt 0.912498 0.083321
vt 0.934396 0.039656
vt 0.912498 0.051061
vt 0.807615 0.088045
vt 0.807615 0.055785
vt 0.807615 0.023526
vt 0.891510 0.631525
vt 0.880105 0.609627
vt 0.807615 0.120305
vt 0.934396 0.168694
vt 0.912498 0.180099
vt 0.807615 0.184824
vt 0.807615 0.152564
vt 0.934396 0.136434
vt 0.912498 0.147840
vt 0.912498 0.115580
vt 0.934396 0.104175
vt 0.912498 0.092769
vt 0.265472 0.927093
vt 0.265472 0.951784
vt 0.023526 0.951784
vt 0.265473 0.976474
vt 0.023526 0.976474
vt 0.281602 0.635120
vt 0.281602 0.554471
vt 0.442900 0.554471
vt 0.265472 0.778951
vt 0.265472 0.803641
vt 0.023526 0.803641
vt 0.184824 0.554471
vt 0.184824 0.635120
vt 0.023526 0.635120
vt 0.265472 0.828332
vt 0.023526 0.828331
vt 0.539679 0.554471
vt 0.539679 0.635120
vt 0.265472 0.853022
vt 0.023526 0.853022
vt 0.442900 0.635120
vt 0.442900 0.731899
vt 0.281602 0.731899
vt 0.265472 0.877712
vt 0.023526 0.877712
vt 0.265472 0.902403
vt 0.023526 0.927093
vt 0.023526 0.902403
vt 0.281602 0.457692
vt 0.442900 0.457692
vt 0.413772 0.410641
vt 0.828328 0.463754
vt 0.828328 0.560733
vt 0.828329 0.706201
vt 0.828329 0.657711
vt 0.828329 0.609222
vt 0.666017 0.554672
vt 0.666017 0.457692
vt 0.666018 0.651651
vt 0.594796 0.878530
vt 0.586731 0.870465
vt 0.659315 0.823689
vt 0.667380 0.870465
vt 0.815679 0.286717
vt 0.807615 0.239940
vt 0.880199 0.231875
vt 0.888264 0.239940
vt 0.722496 0.878530
vt 0.714431 0.831754
vt 0.787015 0.823689
vt 0.795080 0.870465
vt 0.850197 0.878530
vt 0.842132 0.831754
vt 0.914716 0.823689
vt 0.922781 0.831754
vt 0.815679 0.388609
vt 0.807615 0.341833
vt 0.880199 0.333768
vt 0.888263 0.341833
vt 0.930222 0.530276
vt 0.883446 0.538341
vt 0.875381 0.465757
vt 0.922157 0.457692
vt 0.487791 0.831372
vt 0.319508 0.795080
vt 0.312524 0.782983
vt 0.319508 0.778950
vt 0.023526 0.778950
vt 0.023526 0.554471
vn 0.000000 1.000000 0.000000
vn 0.000000 -0.988000 -0.154400
vn 0.000000 0.000000 1.000000
@ -178,223 +406,223 @@ vn -0.000000 0.923900 0.382700
vn -0.000000 0.382700 -0.923900
vn -0.000000 0.923900 -0.382700
s off
f 1//1 5//1 7//1
f 6//2 2//2 4//2
f 7//3 8//3 4//3
f 3//4 4//4 2//4
f 1//5 2//5 6//5
f 7//6 5//6 6//6
f 13//7 25//7 27//7
f 9//8 21//8 22//8
f 20//3 10//3 24//3
f 15//9 27//9 29//9
f 10//3 16//3 14//3
f 17//10 29//10 31//10
f 19//11 31//11 21//11
f 18//3 20//3 32//3
f 13//12 11//12 22//12
f 16//3 18//3 30//3
f 10//3 12//3 23//3
f 14//3 16//3 28//3
f 12//3 14//3 26//3
f 34//13 33//13 21//13
f 35//13 34//13 24//13
f 22//13 36//13 35//13
f 33//13 36//13 22//13
f 38//4 37//4 22//4
f 26//4 39//4 38//4
f 25//4 40//4 39//4
f 37//4 40//4 25//4
f 42//14 41//14 25//14
f 43//14 42//14 26//14
f 27//14 44//14 43//14
f 41//14 44//14 27//14
f 46//15 45//15 27//15
f 47//15 46//15 28//15
f 29//15 48//15 47//15
f 45//15 48//15 29//15
f 50//16 49//16 31//16
f 24//16 51//16 50//16
f 21//16 52//16 51//16
f 49//16 52//16 21//16
f 54//6 53//6 29//6
f 55//6 54//6 30//6
f 31//6 56//6 55//6
f 53//6 56//6 31//6
f 58//13 59//13 60//13
f 58//17 57//17 33//17
f 35//5 59//5 58//5
f 60//18 59//18 35//18
f 57//3 60//3 36//3
f 62//4 63//4 64//4
f 62//19 61//19 37//19
f 63//5 62//5 38//5
f 64//1 63//1 39//1
f 37//3 61//3 64//3
f 66//14 67//14 68//14
f 66//20 65//20 41//20
f 67//5 66//5 42//5
f 68//21 67//21 43//21
f 65//3 68//3 44//3
f 70//15 71//15 72//15
f 70//18 69//18 45//18
f 71//5 70//5 46//5
f 72//17 71//17 47//17
f 45//3 69//3 72//3
f 74//16 75//16 76//16
f 74//21 73//21 49//21
f 75//5 74//5 50//5
f 76//20 75//20 51//20
f 49//3 73//3 76//3
f 78//6 79//6 80//6
f 78//1 77//1 53//1
f 79//5 78//5 54//5
f 80//19 79//19 55//19
f 77//3 80//3 56//3
f 82//13 84//13 83//13
f 84//4 86//4 85//4
f 86//14 88//14 87//14
f 88//15 90//15 89//15
f 82//3 88//3 86//3
f 92//16 82//16 81//16
f 90//6 92//6 91//6
f 94//22 98//22 99//22
f 98//23 101//23 102//23
f 101//24 104//24 105//24
f 104//25 107//25 108//25
f 107//26 110//26 111//26
f 96//27 95//27 99//27
f 96//28 99//28 102//28
f 94//18 109//18 106//18
f 106//1 103//1 101//1
f 96//29 102//29 105//29
f 94//20 110//20 93//20
f 96//30 105//30 108//30
f 104//17 100//17 97//17
f 96//31 108//31 111//31
f 111//32 110//32 94//32
f 110//19 107//19 97//19
f 96//33 111//33 95//33
f 115//34 117//34 116//34
f 117//35 119//35 118//35
f 135//1 131//1 112//1
f 119//36 121//36 120//36
f 130//19 134//19 132//19
f 121//37 123//37 122//37
f 112//3 113//3 132//3
f 123//38 125//38 124//38
f 133//4 132//4 134//4
f 125//39 127//39 126//39
f 135//5 134//5 130//5
f 129//40 115//40 114//40
f 127//41 129//41 128//41
f 131//6 130//6 113//6
f 3//1 1//1 7//1
f 8//2 6//2 4//2
f 3//3 7//3 4//3
f 1//4 3//4 2//4
f 5//5 1//5 6//5
f 8//6 7//6 6//6
f 15//7 13//7 27//7
f 11//8 9//8 22//8
f 32//3 20//3 24//3
f 17//9 15//9 29//9
f 14//3 12//3 10//3
f 10//3 20//3 18//3
f 18//3 16//3 10//3
f 19//10 17//10 31//10
f 9//11 19//11 21//11
f 30//3 18//3 32//3
f 25//12 13//12 22//12
f 28//3 16//3 30//3
f 24//3 10//3 23//3
f 26//3 14//3 28//3
f 23//3 12//3 26//3
f 24//13 34//13 21//13
f 23//13 35//13 24//13
f 23//13 22//13 35//13
f 21//13 33//13 22//13
f 23//4 38//4 22//4
f 23//4 26//4 38//4
f 26//4 25//4 39//4
f 22//4 37//4 25//4
f 26//14 42//14 25//14
f 28//14 43//14 26//14
f 28//14 27//14 43//14
f 25//14 41//14 27//14
f 28//15 46//15 27//15
f 30//15 47//15 28//15
f 30//15 29//15 47//15
f 27//15 45//15 29//15
f 32//16 50//16 31//16
f 32//16 24//16 50//16
f 24//16 21//16 51//16
f 31//16 49//16 21//16
f 30//6 54//6 29//6
f 32//6 55//6 30//6
f 32//6 31//6 55//6
f 29//6 53//6 31//6
f 57//13 58//13 60//13
f 34//17 58//17 33//17
f 34//5 35//5 58//5
f 36//18 60//18 35//18
f 33//3 57//3 36//3
f 61//4 62//4 64//4
f 38//19 62//19 37//19
f 39//5 63//5 38//5
f 40//1 64//1 39//1
f 40//3 37//3 64//3
f 65//14 66//14 68//14
f 42//20 66//20 41//20
f 43//5 67//5 42//5
f 44//21 68//21 43//21
f 41//3 65//3 44//3
f 69//15 70//15 72//15
f 46//18 70//18 45//18
f 47//5 71//5 46//5
f 48//17 72//17 47//17
f 48//3 45//3 72//3
f 73//16 74//16 76//16
f 50//21 74//21 49//21
f 51//5 75//5 50//5
f 52//20 76//20 51//20
f 52//3 49//3 76//3
f 77//6 78//6 80//6
f 54//1 78//1 53//1
f 55//5 79//5 54//5
f 56//19 80//19 55//19
f 53//3 77//3 56//3
f 81//13 82//13 83//13
f 83//4 84//4 85//4
f 85//14 86//14 87//14
f 87//15 88//15 89//15
f 86//3 84//3 82//3
f 82//3 92//3 90//3
f 90//3 88//3 82//3
f 91//16 92//16 81//16
f 89//6 90//6 91//6
f 95//22 94//22 99//22
f 99//23 98//23 102//23
f 102//24 101//24 105//24
f 105//25 104//25 108//25
f 108//26 107//26 111//26
f 98//18 94//18 106//18
f 98//1 106//1 101//1
f 109//20 94//20 93//20
f 107//17 104//17 97//17
f 95//32 111//32 94//32
f 93//19 110//19 97//19
f 114//34 115//34 116//34
f 116//35 117//35 118//35
f 133//1 135//1 112//1
f 118//36 119//36 120//36
f 113//19 130//19 132//19
f 120//37 121//37 122//37
f 133//3 112//3 132//3
f 122//38 123//38 124//38
f 135//4 133//4 134//4
f 124//39 125//39 126//39
f 131//5 135//5 130//5
f 128//40 129//40 114//40
f 126//41 127//41 128//41
f 112//6 131//6 113//6
f 1/1/1 5/2/1 7/3/1
f 6/4/2 2/5/2 4/6/2
f 7/3/3 8/7/3 4/6/3
f 3/8/4 4/9/4 2/10/4
f 1/1/5 2/11/5 6/12/5
f 7/3/6 5/2/6 6/13/6
f 13/14/7 25/15/7 27/16/7
f 9/17/8 21/18/8 22/19/8
f 20/20/3 10/21/3 24/22/3
f 15/23/9 27/24/9 29/25/9
f 10/21/3 16/26/3 14/27/3
f 17/28/10 29/25/10 31/29/10
f 19/30/11 31/29/11 21/18/11
f 18/31/3 20/20/3 32/32/3
f 13/33/12 11/34/12 22/19/12
f 16/26/3 18/31/3 30/35/3
f 10/21/3 12/36/3 23/37/3
f 14/27/3 16/26/3 28/38/3
f 12/36/3 14/27/3 26/39/3
f 34/40/13 33/41/13 21/18/13
f 35/42/13 34/40/13 24/43/13
f 22/19/13 36/44/13 35/42/13
f 33/41/13 36/44/13 22/19/13
f 38/45/4 37/46/4 22/19/4
f 26/47/4 39/48/4 38/45/4
f 25/15/4 40/49/4 39/48/4
f 37/46/4 40/49/4 25/15/4
f 42/50/14 41/51/14 25/15/14
f 43/52/14 42/50/14 26/47/14
f 27/16/14 44/53/14 43/52/14
f 41/51/14 44/53/14 27/16/14
f 46/54/15 45/55/15 27/24/15
f 47/56/15 46/54/15 28/38/15
f 29/25/15 48/57/15 47/56/15
f 45/55/15 48/57/15 29/25/15
f 50/58/16 49/59/16 31/29/16
f 24/43/16 51/60/16 50/58/16
f 21/18/16 52/61/16 51/60/16
f 49/59/16 52/61/16 21/18/16
f 54/62/6 53/63/6 29/25/6
f 55/64/6 54/62/6 30/35/6
f 31/29/6 56/65/6 55/64/6
f 53/63/6 56/65/6 31/29/6
f 58/66/13 59/67/13 60/68/13
f 58/66/17 57/69/17 33/70/17
f 35/71/5 59/67/5 58/66/5
f 60/68/18 59/67/18 35/72/18
f 57/69/3 60/68/3 36/73/3
f 62/74/4 63/75/4 64/76/4
f 62/74/19 61/77/19 37/78/19
f 63/75/5 62/74/5 38/79/5
f 64/76/1 63/75/1 39/80/1
f 37/81/3 61/77/3 64/76/3
f 66/82/14 67/83/14 68/84/14
f 66/82/20 65/85/20 41/86/20
f 67/83/5 66/82/5 42/87/5
f 68/84/21 67/83/21 43/88/21
f 65/85/3 68/84/3 44/89/3
f 70/90/15 71/91/15 72/92/15
f 70/90/18 69/93/18 45/94/18
f 71/91/5 70/90/5 46/95/5
f 72/92/17 71/91/17 47/96/17
f 45/97/3 69/93/3 72/92/3
f 74/98/16 75/99/16 76/100/16
f 74/98/21 73/101/21 49/102/21
f 75/99/5 74/98/5 50/103/5
f 76/100/20 75/99/20 51/104/20
f 49/105/3 73/101/3 76/100/3
f 78/106/6 79/107/6 80/108/6
f 78/106/1 77/109/1 53/110/1
f 79/107/5 78/106/5 54/111/5
f 80/108/19 79/107/19 55/112/19
f 77/109/3 80/108/3 56/113/3
f 82/114/13 84/115/13 83/116/13
f 84/115/4 86/117/4 85/118/4
f 86/117/14 88/119/14 87/120/14
f 88/121/15 90/122/15 89/123/15
f 82/124/3 88/119/3 86/117/3
f 92/125/16 82/114/16 81/126/16
f 90/122/6 92/125/6 91/127/6
f 94/128/22 98/129/22 99/130/22
f 98/129/23 101/131/23 102/132/23
f 101/133/24 104/134/24 105/135/24
f 104/136/25 107/137/25 108/138/25
f 107/137/26 110/139/26 111/140/26
f 96/141/27 95/142/27 99/130/27
f 96/143/28 99/144/28 102/132/28
f 94/128/18 109/145/18 106/146/18
f 106/146/1 103/147/1 101/131/1
f 96/148/29 102/149/29 105/135/29
f 94/128/20 110/139/20 93/150/20
f 96/151/30 105/152/30 108/138/30
f 104/136/17 100/153/17 97/154/17
f 96/155/31 108/156/31 111/140/31
f 111/157/32 110/139/32 94/128/32
f 110/139/19 107/137/19 97/154/19
f 96/158/33 111/157/33 95/159/33
f 115/160/34 117/161/34 116/162/34
f 117/161/35 119/163/35 118/164/35
f 135/165/1 131/166/1 112/167/1
f 119/168/36 121/169/36 120/170/36
f 130/171/19 134/172/19 132/173/19
f 121/169/37 123/174/37 122/175/37
f 112/167/3 113/176/3 132/177/3
f 123/174/38 125/178/38 124/179/38
f 133/180/4 132/181/4 134/182/4
f 125/178/39 127/183/39 126/184/39
f 135/165/5 134/172/5 130/171/5
f 129/185/40 115/160/40 114/186/40
f 127/183/41 129/185/41 128/187/41
f 131/166/6 130/188/6 113/189/6
f 3/8/1 1/1/1 7/3/1
f 8/7/2 6/4/2 4/6/2
f 3/8/3 7/3/3 4/6/3
f 1/1/4 3/8/4 2/10/4
f 5/2/5 1/1/5 6/12/5
f 8/190/6 7/3/6 6/13/6
f 15/191/7 13/14/7 27/16/7
f 11/192/8 9/17/8 22/19/8
f 32/32/3 20/20/3 24/22/3
f 17/193/9 15/23/9 29/25/9
f 14/27/3 12/36/3 10/21/3
f 10/21/3 20/20/3 18/31/3
f 18/31/3 16/26/3 10/21/3
f 19/194/10 17/28/10 31/29/10
f 9/195/11 19/30/11 21/18/11
f 30/35/3 18/31/3 32/32/3
f 25/15/12 13/33/12 22/19/12
f 28/38/3 16/26/3 30/35/3
f 24/22/3 10/21/3 23/37/3
f 26/39/3 14/27/3 28/38/3
f 23/37/3 12/36/3 26/39/3
f 24/43/13 34/40/13 21/18/13
f 23/196/13 35/42/13 24/43/13
f 23/196/13 22/19/13 35/42/13
f 21/18/13 33/41/13 22/19/13
f 23/196/4 38/45/4 22/19/4
f 23/196/4 26/47/4 38/45/4
f 26/47/4 25/15/4 39/48/4
f 22/19/4 37/46/4 25/15/4
f 26/47/14 42/50/14 25/15/14
f 28/197/14 43/52/14 26/47/14
f 28/197/14 27/16/14 43/52/14
f 25/15/14 41/51/14 27/16/14
f 28/38/15 46/54/15 27/24/15
f 30/35/15 47/56/15 28/38/15
f 30/35/15 29/25/15 47/56/15
f 27/24/15 45/55/15 29/25/15
f 32/198/16 50/58/16 31/29/16
f 32/198/16 24/43/16 50/58/16
f 24/43/16 21/18/16 51/60/16
f 31/29/16 49/59/16 21/18/16
f 30/35/6 54/62/6 29/25/6
f 32/198/6 55/64/6 30/35/6
f 32/198/6 31/29/6 55/64/6
f 29/25/6 53/63/6 31/29/6
f 57/69/13 58/66/13 60/68/13
f 34/199/17 58/66/17 33/70/17
f 34/200/5 35/71/5 58/66/5
f 36/201/18 60/68/18 35/72/18
f 33/202/3 57/69/3 36/73/3
f 61/77/4 62/74/4 64/76/4
f 38/203/19 62/74/19 37/78/19
f 39/204/5 63/75/5 38/79/5
f 40/205/1 64/76/1 39/80/1
f 40/206/3 37/81/3 64/76/3
f 65/85/14 66/82/14 68/84/14
f 42/207/20 66/82/20 41/86/20
f 43/208/5 67/83/5 42/87/5
f 44/209/21 68/84/21 43/88/21
f 41/210/3 65/85/3 44/89/3
f 69/93/15 70/90/15 72/92/15
f 46/211/18 70/90/18 45/94/18
f 47/212/5 71/91/5 46/95/5
f 48/213/17 72/92/17 47/96/17
f 48/214/3 45/97/3 72/92/3
f 73/101/16 74/98/16 76/100/16
f 50/215/21 74/98/21 49/102/21
f 51/216/5 75/99/5 50/103/5
f 52/217/20 76/100/20 51/104/20
f 52/218/3 49/105/3 76/100/3
f 77/109/6 78/106/6 80/108/6
f 54/219/1 78/106/1 53/110/1
f 55/220/5 79/107/5 54/111/5
f 56/221/19 80/108/19 55/112/19
f 53/222/3 77/109/3 56/113/3
f 81/126/13 82/114/13 83/116/13
f 83/116/4 84/115/4 85/118/4
f 85/118/14 86/117/14 87/120/14
f 87/223/15 88/121/15 89/123/15
f 86/117/3 84/224/3 82/124/3
f 82/124/3 92/225/3 90/226/3
f 90/226/3 88/119/3 82/124/3
f 91/127/16 92/125/16 81/126/16
f 89/123/6 90/122/6 91/127/6
f 95/142/22 94/128/22 99/130/22
f 99/144/23 98/129/23 102/132/23
f 102/149/24 101/133/24 105/135/24
f 105/152/25 104/136/25 108/138/25
f 108/156/26 107/137/26 111/140/26
f 98/129/18 94/128/18 106/146/18
f 98/129/1 106/146/1 101/131/1
f 109/145/20 94/128/20 93/150/20
f 107/137/17 104/136/17 97/154/17
f 95/159/32 111/157/32 94/128/32
f 93/150/19 110/139/19 97/154/19
f 114/186/34 115/160/34 116/162/34
f 116/162/35 117/161/35 118/164/35
f 133/180/1 135/165/1 112/167/1
f 118/227/36 119/168/36 120/170/36
f 113/228/19 130/171/19 132/173/19
f 120/170/37 121/169/37 122/175/37
f 133/180/3 112/167/3 132/177/3
f 122/175/38 123/174/38 124/179/38
f 135/165/4 133/180/4 134/182/4
f 124/179/39 125/178/39 126/184/39
f 131/166/5 135/165/5 130/171/5
f 128/187/40 129/185/40 114/186/40
f 126/184/41 127/183/41 128/187/41
f 112/167/6 131/166/6 113/189/6

View File

@ -51,6 +51,10 @@
"weapon.sparkShoot": {"category": "player", "sounds": ["weapon/sparkShoot1", "weapon/sparkShoot2", "weapon/sparkShoot3"]},
"weapon.bang": {"category": "player", "sounds": [{"name": "weapon/bang", "stream": false}]},
"weapon.reloadTurret": {"category": "player", "sounds": [{"name": "weapon/reloadTurret", "stream": false}]},
"weapon.switchmode1": {"category": "player", "sounds": [{"name": "weapon/switchmode1", "stream": false}]},
"weapon.switchmode2": {"category": "player", "sounds": [{"name": "weapon/switchmode2", "stream": false}]},
"entity.chopperFlyingLoop": {"category": "hostile", "sounds": [{"name": "entity/chopperFlyingLoop", "stream": true}]},
"entity.chopperDrop": {"category": "hostile", "sounds": [{"name": "entity/chopperDrop", "stream": false}]},
"entity.chopperCharge": {"category": "hostile", "sounds": [{"name": "entity/chopperCharge", "stream": false}]},

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 169 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 250 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 174 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 164 B

View File

Before

Width:  |  Height:  |  Size: 225 B

After

Width:  |  Height:  |  Size: 225 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 290 B

After

Width:  |  Height:  |  Size: 342 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 290 B

After

Width:  |  Height:  |  Size: 334 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 258 B

After

Width:  |  Height:  |  Size: 299 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 297 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 299 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 297 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 298 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 290 B

After

Width:  |  Height:  |  Size: 334 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 294 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 303 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 294 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 235 B

After

Width:  |  Height:  |  Size: 218 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 235 B

After

Width:  |  Height:  |  Size: 218 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 243 B

After

Width:  |  Height:  |  Size: 217 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 208 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 207 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 205 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 210 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 248 B

After

Width:  |  Height:  |  Size: 218 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 217 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 219 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 218 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 278 B

After

Width:  |  Height:  |  Size: 254 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 256 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 250 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 250 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 254 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 286 B

After

Width:  |  Height:  |  Size: 269 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 254 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 255 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 257 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 238 B

After

Width:  |  Height:  |  Size: 199 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 204 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 202 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 201 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 204 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 277 B

After

Width:  |  Height:  |  Size: 292 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 290 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 303 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 301 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 308 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 283 B

After

Width:  |  Height:  |  Size: 310 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 307 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 310 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 292 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 243 B

After

Width:  |  Height:  |  Size: 221 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 203 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 208 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 202 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 339 B

View File

Before

Width:  |  Height:  |  Size: 335 B

After

Width:  |  Height:  |  Size: 335 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 499 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 22 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 30 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 29 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 329 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 30 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 27 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 31 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 20 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 22 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 52 KiB

View File

@ -2,8 +2,12 @@ package com.hbm.blocks.bomb;
import java.util.Random;
import com.hbm.tileentity.bomb.TileEntityTurretBase;
import net.minecraft.block.BlockContainer;
import net.minecraft.block.material.Material;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.util.ChatComponentText;
import net.minecraft.world.World;
public abstract class TurretBase extends BlockContainer {
@ -29,7 +33,7 @@ public abstract class TurretBase extends BlockContainer {
return false;
}
public abstract void executeHoldAction(World world, int i, double yaw, double pitch, int x, int y, int z);
public abstract boolean executeHoldAction(World world, int i, double yaw, double pitch, int x, int y, int z);
public abstract void executeReleaseAction(World world, int i, double yaw, double pitch, int x, int y, int z);
}

View File

@ -23,7 +23,9 @@ public class TurretFlamer extends TurretBase {
}
@Override
public void executeHoldAction(World world, int i, double yaw, double pitch, int x, int y, int z) {
public boolean executeHoldAction(World world, int i, double yaw, double pitch, int x, int y, int z) {
boolean flag = false;
if(pitch < -60)
pitch = -60;
@ -57,7 +59,11 @@ public class TurretFlamer extends TurretBase {
world.playSoundEffect(x, y, z, "hbm:weapon.flamethrowerIgnite", 1.0F, 1.0F);
else
world.playSoundEffect(x, y, z, "hbm:weapon.flamethrowerShoot", 1.0F, 1.0F);
flag = true;
}
return flag;
}
@Override

View File

@ -24,7 +24,9 @@ public class TurretHeavy extends TurretBase {
}
@Override
public void executeHoldAction(World world, int i, double yaw, double pitch, int x, int y, int z) {
public boolean executeHoldAction(World world, int i, double yaw, double pitch, int x, int y, int z) {
boolean flag = false;
if(pitch < -60)
pitch = -60;
@ -61,7 +63,11 @@ public class TurretHeavy extends TurretBase {
}
world.playSoundEffect(x, y, z, "hbm:weapon.defabShoot", 1.0F, 0.75F);
flag = true;
}
return flag;
}
@Override

View File

@ -22,7 +22,9 @@ public class TurretLight extends TurretBase {
}
@Override
public void executeHoldAction(World world, int i, double yaw, double pitch, int x, int y, int z) {
public boolean executeHoldAction(World world, int i, double yaw, double pitch, int x, int y, int z) {
boolean flag = false;
if(pitch < -60)
pitch = -60;
@ -53,7 +55,11 @@ public class TurretLight extends TurretBase {
}
world.playSoundEffect(x, y, z, "hbm:weapon.rifleShoot", 1.0F, 0.5F + rand.nextFloat() * 0.25F);
flag = true;
}
return flag;
}
@Override

View File

@ -23,7 +23,9 @@ public class TurretRocket extends TurretBase {
}
@Override
public void executeHoldAction(World world, int i, double yaw, double pitch, int x, int y, int z) {
public boolean executeHoldAction(World world, int i, double yaw, double pitch, int x, int y, int z) {
boolean flag = false;
if(pitch < -60)
pitch = -60;
@ -58,7 +60,11 @@ public class TurretRocket extends TurretBase {
}
world.playSoundEffect(x, y, z, "hbm:weapon.rpgShoot", 1.0F, 0.75F);
flag = true;
}
return flag;
}
@Override

View File

@ -22,7 +22,9 @@ public class TurretTau extends TurretBase {
}
@Override
public void executeHoldAction(World world, int i, double yaw, double pitch, int x, int y, int z) {
public boolean executeHoldAction(World world, int i, double yaw, double pitch, int x, int y, int z) {
boolean flag = false;
if(pitch < -60)
pitch = -60;
@ -54,7 +56,11 @@ public class TurretTau extends TurretBase {
}
world.playSoundEffect(x, y, z, "hbm:weapon.tauShoot", 1.0F, 0.5F);
flag = true;
}
return flag;
}
@Override

View File

@ -14,10 +14,15 @@ import net.minecraft.block.material.Material;
import net.minecraft.enchantment.EnchantmentProtection;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.AxisAlignedBB;
import net.minecraft.util.MathHelper;
import net.minecraft.util.Vec3;
import net.minecraft.world.World;
import net.minecraft.world.WorldServer;
import net.minecraft.world.chunk.Chunk;
import net.minecraft.world.chunk.IChunkProvider;
import net.minecraft.world.gen.ChunkProviderServer;
public class TestEventTester extends Block {
@ -31,10 +36,10 @@ public class TestEventTester extends Block {
}
@Override
public void onNeighborBlockChange(World p_149695_1_, int x, int y, int z, Block p_149695_5_)
public void onNeighborBlockChange(World p_149695_1_, int x1, int y1, int z1, Block p_149695_5_)
{
this.worldObj = p_149695_1_;
if (p_149695_1_.isBlockIndirectlyGettingPowered(x, y, z))
if (p_149695_1_.isBlockIndirectlyGettingPowered(x1, y1, z1))
{
//The laser thread is too dangerous to use right now
//ThreadLaser laser = new ThreadLaser(p_149695_1_, x, y, z, "north");
@ -68,11 +73,53 @@ public class TestEventTester extends Block {
//worldObj.setBlock(x, y, z, Blocks.air);
//ExplosionLarge.explode(worldObj, x + 0.5, y + 0.5, z + 0.5, MainRegistry.x, true, true, true);
EntityBlackHole bl = new EntityBlackHole(worldObj, MainRegistry.x * 0.1F);
/*EntityBlackHole bl = new EntityBlackHole(worldObj, MainRegistry.x * 0.1F);
bl.posX = x + 0.5F;
bl.posY = y + 0.5F;
bl.posZ = z + 0.5F;
worldObj.spawnEntityInWorld(bl);
worldObj.spawnEntityInWorld(bl);*/
if(!worldObj.isRemote)
{
try {
Chunk oldChunk = worldObj.getChunkFromBlockCoords(x1, z1);
if(worldObj instanceof WorldServer)
{
WorldServer worldServer = (WorldServer) worldObj;
ChunkProviderServer chunkProviderServer = worldServer.theChunkProviderServer;
IChunkProvider chunkProviderGenerate = chunkProviderServer.currentChunkProvider;
Chunk newChunk = chunkProviderGenerate.provideChunk(oldChunk.xPosition, oldChunk.zPosition);
for (int x = 0; x < 16; x++)
{
for (int z = 0; z < 16; z++)
{
for (int y = 0; y < worldObj.getHeight(); y++)
{
Block block = newChunk.getBlock(x, y, z);
int metadata = newChunk.getBlockMetadata(x, y, z);
worldServer.setBlock(x + oldChunk.xPosition * 16, y, z + oldChunk.zPosition * 16, block, metadata, 2);
TileEntity tileEntity = newChunk.getTileEntityUnsafe(x, y, z);
if(tileEntity != null)
{
worldServer.setTileEntity(x + oldChunk.xPosition * 16, y, z + oldChunk.zPosition * 16, tileEntity);
}
}
}
}
oldChunk.isTerrainPopulated = false;
chunkProviderGenerate.populate(chunkProviderGenerate, oldChunk.xPosition, oldChunk.zPosition);
}
} catch(Exception e) {
System.out.println("Rejuvenation Failed!");
e.printStackTrace();
}
}
}
}

View File

@ -0,0 +1,30 @@
package com.hbm.entity.effect;
import net.minecraft.world.World;
public class EntityVortex extends EntityBlackHole {
public EntityVortex(World p_i1582_1_) {
super(p_i1582_1_);
this.ignoreFrustumCheck = true;
this.isImmuneToFire = true;
}
public EntityVortex(World world, float size) {
super(world);
this.dataWatcher.updateObject(16, size);
}
@Override
public void onUpdate() {
this.dataWatcher.updateObject(16, this.dataWatcher.getWatchableObjectFloat(16) - 0.0025F);
if(this.dataWatcher.getWatchableObjectFloat(16) <= 0) {
this.setDead();
return;
}
super.onUpdate();
}
}

View File

@ -38,9 +38,12 @@ public class FluidTypeHandler {
BIOGAS (0xbfd37c, 12571516, 12, 2, "hbmfluid.biogas"),
BIOFUEL (0xeef274, 15659636, 13, 2, "hbmfluid.biofuel"),
NITAN (0x8018ad, 8394925, 15, 2, "hbmfluid.nitan"),
UF6 (0xD1CEBE, 13749950, 14, 1, "hbmfluid.uf6"),
PUF6 (0x4C4C4C, 5000268, 15, 1, "hbmfluid.puf6"),
SAS3 (0x4ffffc, 5242876, 14, 2, "hbmfluid.sas3"),
AMAT (0x010101, 65793, 0, 2, "hbmfluid.amat"),
ASCHRAB (0xb50000, 11862016, 1, 2, "hbmfluid.aschrab"),

View File

@ -14,6 +14,7 @@ import com.hbm.items.tool.ItemChemistryTemplate;
import com.hbm.items.tool.ItemFluidIcon;
import com.hbm.main.MainRegistry;
import net.minecraft.enchantment.Enchantment;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
import net.minecraft.item.Item;
@ -2097,6 +2098,18 @@ public class MachineRecipes {
list.add(new ItemStack(ModItems.drill_titanium, 1));
list.add(new ItemStack(ModItems.wire_red_copper, 6));
break;
case PUMPJACK:
list.add(new ItemStack(ModBlocks.steel_scaffold, 8));
list.add(new ItemStack(ModBlocks.block_steel, 8));
list.add(new ItemStack(ModItems.pipes_steel, 4));
list.add(new ItemStack(ModItems.tank_steel, 4));
list.add(new ItemStack(ModItems.ingot_steel, 24));
list.add(new ItemStack(ModItems.plate_steel, 16));
list.add(new ItemStack(ModItems.plate_aluminium, 6));
list.add(new ItemStack(ModItems.drill_titanium, 1));
list.add(new ItemStack(ModItems.motor, 2));
list.add(new ItemStack(ModItems.wire_red_copper, 8));
break;
case FLARE_STACK:
list.add(new ItemStack(ModBlocks.steel_scaffold, 28));
list.add(new ItemStack(ModItems.tank_steel, 2));
@ -2132,6 +2145,7 @@ public class MachineRecipes {
list.add(new ItemStack(ModItems.hull_big_steel, 4));
break;
case MINER:
list.add(new ItemStack(ModBlocks.steel_scaffold, 12));
list.add(new ItemStack(ModItems.ingot_steel, 4));
list.add(new ItemStack(ModItems.plate_titanium, 6));
list.add(new ItemStack(ModItems.wire_red_copper, 4));
@ -2141,6 +2155,15 @@ public class MachineRecipes {
list.add(new ItemStack(ModItems.bolt_dura_steel, 2));
list.add(new ItemStack(ModItems.drill_titanium, 1));
break;
case TURBOFAN:
list.add(new ItemStack(ModItems.hull_big_steel, 1));
list.add(new ItemStack(ModItems.hull_big_titanium, 3));
list.add(new ItemStack(ModItems.hull_small_steel, 2));
list.add(new ItemStack(ModItems.turbine_tungsten, 1));
list.add(new ItemStack(ModItems.turbine_titanium, 7));
list.add(new ItemStack(ModItems.bolt_compound, 8));
list.add(new ItemStack(ModItems.ingot_red_copper, 24));
break;
case TELEPORTER:
list.add(new ItemStack(ModItems.ingot_titanium, 6));
list.add(new ItemStack(ModItems.plate_advanced_alloy, 12));
@ -2198,6 +2221,11 @@ public class MachineRecipes {
list.add(new ItemStack(ModItems.plate_lead, 2));
list.add(new ItemStack(ModItems.rod_empty, 3));
break;
case LR_CONTROL:
list.add(new ItemStack(ModItems.ingot_steel, 6));
list.add(new ItemStack(ModItems.ingot_lead, 4));
list.add(new ItemStack(ModItems.motor, 1));
break;
case LR_HATCH:
list.add(new ItemStack(ModBlocks.brick_concrete, 1));
list.add(new ItemStack(ModItems.plate_steel, 6));
@ -2396,6 +2424,48 @@ public class MachineRecipes {
list.add(new ItemStack(ModBlocks.machine_battery, 1));
list.add(new ItemStack(ModItems.circuit_gold, 2));
break;
case TURRET_LIGHT:
list.add(new ItemStack(ModItems.ingot_steel, 6));
list.add(new ItemStack(ModItems.pipes_steel, 2));
list.add(new ItemStack(ModItems.ingot_red_copper, 2));
list.add(new ItemStack(ModItems.motor, 2));
list.add(new ItemStack(ModItems.circuit_red_copper, 2));
break;
case TURRET_HEAVY:
list.add(new ItemStack(ModItems.ingot_steel, 8));
list.add(new ItemStack(ModItems.ingot_aluminium, 4));
list.add(new ItemStack(ModItems.pipes_steel, 2));
list.add(new ItemStack(ModItems.hull_small_steel, 1));
list.add(new ItemStack(ModItems.ingot_red_copper, 4));
list.add(new ItemStack(ModItems.motor, 2));
list.add(new ItemStack(ModItems.circuit_red_copper, 3));
break;
case TURRET_ROCKET:
list.add(new ItemStack(ModItems.ingot_steel, 12));
list.add(new ItemStack(ModItems.ingot_titanium, 4));
list.add(new ItemStack(ModItems.hull_small_steel, 8));
list.add(new ItemStack(ModItems.ingot_red_copper, 6));
list.add(new ItemStack(ModItems.motor, 2));
list.add(new ItemStack(ModItems.circuit_gold, 2));
break;
case TURRET_FLAMER:
list.add(new ItemStack(ModItems.ingot_steel, 8));
list.add(new ItemStack(ModItems.ingot_tungsten, 2));
list.add(new ItemStack(ModItems.pipes_steel, 1));
list.add(new ItemStack(ModItems.tank_steel, 2));
list.add(new ItemStack(ModItems.ingot_red_copper, 4));
list.add(new ItemStack(ModItems.motor, 2));
list.add(new ItemStack(ModItems.circuit_red_copper, 2));
break;
case TURRET_TAU:
list.add(new ItemStack(ModItems.ingot_steel, 16));
list.add(new ItemStack(ModItems.ingot_titanium, 8));
list.add(new ItemStack(ModItems.plate_advanced_alloy, 4));
list.add(new ItemStack(ModItems.redcoil_capacitor, 3));
list.add(new ItemStack(ModItems.ingot_red_copper, 12));
list.add(new ItemStack(ModItems.motor, 2));
list.add(new ItemStack(ModItems.circuit_gold, 4));
break;
case HUNTER_CHOPPER:
list.add(new ItemStack(ModItems.chopper_blades, 5));
list.add(new ItemStack(ModItems.chopper_gun, 1));
@ -2547,12 +2617,6 @@ public class MachineRecipes {
list.add(new ItemStack(Items.redstone, 7));
list.add(new ItemStack(ModItems.powder_power, 3));
break;
case GREANADE_ENHANCED:
list.add(new ItemStack(ModItems.plate_iron, 4));
list.add(new ItemStack(ModItems.plate_steel, 2));
list.add(new ItemStack(ModItems.wire_red_copper, 2));
list.add(new ItemStack(Blocks.tnt, 1));
break;
case GRENADE_FLAME:
list.add(new ItemStack(ModItems.grenade_frag, 1));
list.add(new ItemStack(ModItems.powder_fire, 1));
@ -3061,6 +3125,9 @@ public class MachineRecipes {
case DERRICK:
output = new ItemStack(ModBlocks.machine_well, 1);
break;
case PUMPJACK:
output = new ItemStack(ModBlocks.machine_pumpjack, 1);
break;
case FLARE_STACK:
output = new ItemStack(ModBlocks.machine_flare, 1);
break;
@ -3076,6 +3143,9 @@ public class MachineRecipes {
case MINER:
output = new ItemStack(ModBlocks.machine_drill, 1);
break;
case TURBOFAN:
output = new ItemStack(ModBlocks.machine_turbofan, 1);
break;
case TELEPORTER:
output = new ItemStack(ModBlocks.machine_teleporter, 1);
break;
@ -3100,6 +3170,9 @@ public class MachineRecipes {
case LR_ELEMENT:
output = new ItemStack(ModBlocks.reactor_element, 1);
break;
case LR_CONTROL:
output = new ItemStack(ModBlocks.reactor_control, 1);
break;
case LR_HATCH:
output = new ItemStack(ModBlocks.reactor_hatch, 1);
break;
@ -3196,6 +3269,21 @@ public class MachineRecipes {
case LAUNCH_PAD:
output = new ItemStack(ModBlocks.launch_pad, 1);
break;
case TURRET_LIGHT:
output = new ItemStack(ModBlocks.turret_light, 1);
break;
case TURRET_HEAVY:
output = new ItemStack(ModBlocks.turret_heavy, 1);
break;
case TURRET_ROCKET:
output = new ItemStack(ModBlocks.turret_rocket, 1);
break;
case TURRET_FLAMER:
output = new ItemStack(ModBlocks.turret_flamer, 1);
break;
case TURRET_TAU:
output = new ItemStack(ModBlocks.turret_tau, 1);
break;
case HUNTER_CHOPPER:
output = new ItemStack(ModItems.chopper, 1);
break;
@ -3262,9 +3350,6 @@ public class MachineRecipes {
case COMBINE_BALL:
output = new ItemStack(ModItems.gun_osipr_ammo2, 1);
break;
case GREANADE_ENHANCED:
output = new ItemStack(ModItems.grenade_strong, 1);
break;
case GRENADE_FLAME:
output = new ItemStack(ModItems.grenade_fire, 1);
break;
@ -3293,7 +3378,7 @@ public class MachineRecipes {
output = new ItemStack(ModItems.grenade_schrabidium, 1);
break;
case GRENADE_NUKE:
output = new ItemStack(ModItems.grenade_nuke, 1);
output = new ItemStack(ModItems.grenade_nuclear, 1);
break;
case GRENADE_ZOMG:
output = new ItemStack(ModItems.grenade_zomg, 1);
@ -3302,7 +3387,10 @@ public class MachineRecipes {
output = new ItemStack(ModItems.grenade_black_hole, 1);
break;
case POWER_FIST:
output = new ItemStack(ModItems.multitool_dig, 1);
ItemStack multitool = new ItemStack(ModItems.multitool_dig, 1);
multitool.addEnchantment(Enchantment.looting, 3);
multitool.addEnchantment(Enchantment.fortune, 3);
output = multitool.copy();
break;
case GADGET_PROPELLANT:
output = new ItemStack(ModItems.gadget_explosive, 1);
@ -3520,6 +3608,18 @@ public class MachineRecipes {
case BP_BIOGAS:
list.add(new ItemStack(ModItems.biomass, 16));
break;
case UF6:
list.add(new ItemStack(ModItems.powder_uranium, 1));
list.add(new ItemStack(ModItems.fluorite, 3));
break;
case PUF6:
list.add(new ItemStack(ModItems.powder_plutonium, 1));
list.add(new ItemStack(ModItems.fluorite, 3));
break;
case SAS3:
list.add(new ItemStack(ModItems.powder_schrabidium, 1));
list.add(new ItemStack(ModItems.sulfur, 2));
break;
default:
break;
}
@ -3670,6 +3770,15 @@ public class MachineRecipes {
case BP_BIOFUEL:
input[0] = new FluidStack(2000, FluidType.BIOGAS);
break;
case UF6:
input[0] = new FluidStack(1000, FluidType.WATER);
break;
case PUF6:
input[0] = new FluidStack(1000, FluidType.WATER);
break;
case SAS3:
input[0] = new FluidStack(2000, FluidType.ACID);
break;
default:
break;
}
@ -3845,6 +3954,15 @@ public class MachineRecipes {
case BP_BIOFUEL:
input[0] = new FluidStack(1000, FluidType.BIOFUEL);
break;
case UF6:
input[0] = new FluidStack(1000, FluidType.UF6);
break;
case PUF6:
input[0] = new FluidStack(1000, FluidType.PUF6);
break;
case SAS3:
input[0] = new FluidStack(1000, FluidType.SAS3);
break;
default:
break;
}

View File

@ -128,6 +128,8 @@ public class ModItems {
public static Item drill_titanium;
public static Item plate_dalekanium;
public static Item plate_euphemium;
public static Item bolt_tungsten;
public static Item bolt_compound;
public static Item ingot_dura_steel;
public static Item ingot_polymer;
@ -265,6 +267,8 @@ public class ModItems {
public static Item blade_titanium;
public static Item turbine_titanium;
public static Item generator_front;
public static Item blade_tungsten;
public static Item turbine_tungsten;
public static Item toothpicks;
public static Item ducttape;
@ -382,10 +386,12 @@ public class ModItems {
public static Item canister_heatingoil;
public static Item canister_naphtha;
public static Item canister_lightoil;
public static Item canister_biofuel;
public static Item gas_empty;
public static Item gas_full;
public static Item gas_petroleum;
public static Item gas_biogas;
public static Item fluid_tank_full;
public static Item fluid_tank_empty;
@ -621,6 +627,10 @@ public class ModItems {
public static Item gun_hp_ammo;
public static Item gun_euthanasia;
public static Item gun_euthanasia_ammo;
public static Item gun_dash;
public static Item gun_dash_ammo;
public static Item gun_twigun;
public static Item gun_twigun_ammo;
public static Item gun_defabricator;
public static Item gun_defabricator_ammo;
public static Item gun_waluigi;
@ -928,6 +938,12 @@ public class ModItems {
public static Item turret_chip;
public static Item chopper;
public static Item turret_light_ammo;
public static Item turret_heavy_ammo;
public static Item turret_rocket_ammo;
public static Item turret_flamer_ammo;
public static Item turret_tau_ammo;
public static Item bucket_mud;
public static Item bucket_acid;
public static Item bucket_toxic;
@ -1036,22 +1052,22 @@ public class ModItems {
test_nuke_tier2_target = new Item().setUnlocalizedName("test_nuke_tier2_target").setMaxStackSize(1).setCreativeTab(null).setTextureName(RefStrings.MODID + ":test_nuke_tier2_target");
ingot_uranium = new ItemRadioactive().setUnlocalizedName("ingot_uranium").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":ingot_uranium");
ingot_u235 = new ItemRadioactive().setUnlocalizedName("ingot_u235").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":ingot_uranium");
ingot_u238 = new ItemRadioactive().setUnlocalizedName("ingot_u238").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":ingot_uranium");
ingot_u235 = new ItemRadioactive().setUnlocalizedName("ingot_u235").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":ingot_u235");
ingot_u238 = new ItemRadioactive().setUnlocalizedName("ingot_u238").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":ingot_u238");
ingot_plutonium = new ItemRadioactive().setUnlocalizedName("ingot_plutonium").setCreativeTab(MainRegistry.tabParts).setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":ingot_plutonium");
ingot_pu238 = new ItemRadioactive().setUnlocalizedName("ingot_pu238").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":ingot_plutonium");
ingot_pu239 = new ItemRadioactive().setUnlocalizedName("ingot_pu239").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":ingot_plutonium");
ingot_pu240 = new ItemRadioactive().setUnlocalizedName("ingot_pu240").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":ingot_plutonium");
ingot_pu238 = new ItemRadioactive().setUnlocalizedName("ingot_pu238").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":ingot_pu238");
ingot_pu239 = new ItemRadioactive().setUnlocalizedName("ingot_pu239").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":ingot_pu239");
ingot_pu240 = new ItemRadioactive().setUnlocalizedName("ingot_pu240").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":ingot_pu240");
ingot_neptunium = new ItemCustomLore().setUnlocalizedName("ingot_neptunium").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":ingot_neptunium");
ingot_titanium = new Item().setUnlocalizedName("ingot_titanium").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":ingot_titanium");
sulfur = new Item().setUnlocalizedName("sulfur").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":sulfur");
ingot_uranium_fuel = new ItemRadioactive().setUnlocalizedName("ingot_uranium_fuel").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":ingot_uranium");
ingot_plutonium_fuel = new ItemRadioactive().setUnlocalizedName("ingot_plutonium_fuel").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":ingot_plutonium");
ingot_uranium_fuel = new ItemRadioactive().setUnlocalizedName("ingot_uranium_fuel").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":ingot_uranium_fuel");
ingot_plutonium_fuel = new ItemRadioactive().setUnlocalizedName("ingot_plutonium_fuel").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":ingot_plutonium_fuel");
ingot_mox_fuel = new ItemRadioactive().setUnlocalizedName("ingot_mox_fuel").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":ingot_mox_fuel");
ingot_schrabidium_fuel = new ItemRadioactive().setUnlocalizedName("ingot_schrabidium_fuel").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":ingot_schrabidium_fuel");
nugget_uranium_fuel = new ItemRadioactive().setUnlocalizedName("nugget_uranium_fuel").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":nugget_uranium");
nugget_plutonium_fuel = new ItemRadioactive().setUnlocalizedName("nugget_plutonium_fuel").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":nugget_plutonium");
nugget_uranium_fuel = new ItemRadioactive().setUnlocalizedName("nugget_uranium_fuel").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":nugget_uranium_fuel");
nugget_plutonium_fuel = new ItemRadioactive().setUnlocalizedName("nugget_plutonium_fuel").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":nugget_plutonium_fuel");
nugget_mox_fuel = new ItemRadioactive().setUnlocalizedName("nugget_mox_fuel").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":nugget_mox_fuel");
nugget_schrabidium_fuel = new ItemRadioactive().setUnlocalizedName("nugget_schrabidium_fuel").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":nugget_schrabidium_fuel");
ingot_advanced_alloy = new Item().setUnlocalizedName("ingot_advanced_alloy").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":ingot_advanced_alloy");
@ -1087,6 +1103,8 @@ public class ModItems {
drill_titanium = new Item().setUnlocalizedName("drill_titanium").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":drill_titanium");
plate_dalekanium = new Item().setUnlocalizedName("plate_dalekanium").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":plate_dalekanium");
plate_euphemium = new ItemCustomLore().setUnlocalizedName("plate_euphemium").setCreativeTab(null).setTextureName(RefStrings.MODID + ":plate_euphemium");
bolt_tungsten = new Item().setUnlocalizedName("bolt_tungsten").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":bolt_tungsten");
bolt_compound = new Item().setUnlocalizedName("bolt_compound").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":bolt_compound");
ingot_dura_steel = new ItemCustomLore().setUnlocalizedName("ingot_dura_steel").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":ingot_dura_steel");
ingot_polymer = new ItemCustomLore().setUnlocalizedName("ingot_polymer").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":ingot_polymer");
@ -1112,12 +1130,12 @@ public class ModItems {
nugget_verticium = new ItemCustomLore().setUnlocalizedName("nugget_verticium").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":nugget_verticium");
nugget_uranium = new ItemRadioactive().setUnlocalizedName("nugget_uranium").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":nugget_uranium");
nugget_u235 = new ItemRadioactive().setUnlocalizedName("nugget_u235").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":nugget_uranium");
nugget_u238 = new ItemRadioactive().setUnlocalizedName("nugget_u238").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":nugget_uranium");
nugget_u235 = new ItemRadioactive().setUnlocalizedName("nugget_u235").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":nugget_u235");
nugget_u238 = new ItemRadioactive().setUnlocalizedName("nugget_u238").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":nugget_u238");
nugget_plutonium = new ItemRadioactive().setUnlocalizedName("nugget_plutonium").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":nugget_plutonium");
nugget_pu238 = new ItemRadioactive().setUnlocalizedName("nugget_pu238").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":nugget_plutonium");
nugget_pu239 = new ItemRadioactive().setUnlocalizedName("nugget_pu239").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":nugget_plutonium");
nugget_pu240 = new ItemRadioactive().setUnlocalizedName("nugget_pu240").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":nugget_plutonium");
nugget_pu238 = new ItemRadioactive().setUnlocalizedName("nugget_pu238").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":nugget_pu238");
nugget_pu239 = new ItemRadioactive().setUnlocalizedName("nugget_pu239").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":nugget_pu239");
nugget_pu240 = new ItemRadioactive().setUnlocalizedName("nugget_pu240").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":nugget_pu240");
nugget_neptunium = new ItemRadioactive().setUnlocalizedName("nugget_neptunium").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":nugget_neptunium");
plate_titanium = new Item().setUnlocalizedName("plate_titanium").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":plate_titanium");
plate_aluminium = new Item().setUnlocalizedName("plate_aluminium").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":plate_aluminium");
@ -1245,6 +1263,8 @@ public class ModItems {
blade_titanium = new Item().setUnlocalizedName("blade_titanium").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":blade_titanium");
turbine_titanium = new Item().setUnlocalizedName("turbine_titanium").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":turbine_titanium");
generator_front = new Item().setUnlocalizedName("generator_front").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":generator_front");
blade_tungsten = new Item().setUnlocalizedName("blade_tungsten").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":blade_tungsten");
turbine_tungsten = new Item().setUnlocalizedName("turbine_tungsten").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":turbine_tungsten");
toothpicks = new Item().setUnlocalizedName("toothpicks").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":toothpicks");
ducttape = new Item().setUnlocalizedName("ducttape").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":ducttape");
@ -1360,9 +1380,11 @@ public class ModItems {
canister_heatingoil = new ItemCustomLore().setUnlocalizedName("canister_heatingoil").setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.canister_empty).setTextureName(RefStrings.MODID + ":canister_heatingoil");
canister_naphtha = new ItemCustomLore().setUnlocalizedName("canister_naphtha").setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.canister_empty).setTextureName(RefStrings.MODID + ":canister_naphtha");
canister_lightoil = new ItemCustomLore().setUnlocalizedName("canister_lightoil").setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.canister_empty).setTextureName(RefStrings.MODID + ":canister_lightoil");
canister_biofuel = new ItemCustomLore().setUnlocalizedName("canister_biofuel").setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.canister_empty).setTextureName(RefStrings.MODID + ":canister_biofuel");
gas_empty = new Item().setUnlocalizedName("gas_empty").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":gas_empty");
gas_full = new Item().setUnlocalizedName("gas_full").setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.gas_empty).setTextureName(RefStrings.MODID + ":gas_full");
gas_petroleum = new Item().setUnlocalizedName("gas_petroleum").setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.gas_empty).setTextureName(RefStrings.MODID + ":gas_petroleum");
gas_biogas = new Item().setUnlocalizedName("gas_biogas").setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.gas_empty).setTextureName(RefStrings.MODID + ":gas_biogas");
tank_waste = new ItemTankWaste().setUnlocalizedName("tank_waste").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts);
@ -1402,12 +1424,12 @@ public class ModItems {
rod_empty = new Item().setUnlocalizedName("rod_empty").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":rod_empty");
rod_uranium = new ItemCustomLore().setUnlocalizedName("rod_uranium").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_uranium");
rod_u235 = new ItemCustomLore().setUnlocalizedName("rod_u235").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_uranium");
rod_u238 = new ItemCustomLore().setUnlocalizedName("rod_u238").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_uranium");
rod_u235 = new ItemCustomLore().setUnlocalizedName("rod_u235").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_u235");
rod_u238 = new ItemCustomLore().setUnlocalizedName("rod_u238").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_u238");
rod_plutonium = new ItemCustomLore().setUnlocalizedName("rod_plutonium").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_plutonium");
rod_pu238 = new ItemCustomLore().setUnlocalizedName("rod_pu238").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_plutonium");
rod_pu239 = new ItemCustomLore().setUnlocalizedName("rod_pu239").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_plutonium");
rod_pu240 = new ItemCustomLore().setUnlocalizedName("rod_pu240").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_plutonium");
rod_pu238 = new ItemCustomLore().setUnlocalizedName("rod_pu238").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_pu238");
rod_pu239 = new ItemCustomLore().setUnlocalizedName("rod_pu239").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_pu239");
rod_pu240 = new ItemCustomLore().setUnlocalizedName("rod_pu240").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_pu240");
rod_neptunium = new ItemCustomLore().setUnlocalizedName("rod_neptunium").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_neptunium");
rod_lead = new Item().setUnlocalizedName("rod_lead").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_lead");
rod_schrabidium = new ItemCustomLore().setUnlocalizedName("rod_schrabidium").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_schrabidium");
@ -1421,34 +1443,34 @@ public class ModItems {
rod_dual_empty = new Item().setUnlocalizedName("rod_dual_empty").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":rod_dual_empty");
rod_dual_uranium = new ItemCustomLore().setUnlocalizedName("rod_dual_uranium").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_uranium");
rod_dual_u235 = new ItemCustomLore().setUnlocalizedName("rod_dual_u235").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_uranium");
rod_dual_u238 = new ItemCustomLore().setUnlocalizedName("rod_dual_u238").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_uranium");
rod_dual_u235 = new ItemCustomLore().setUnlocalizedName("rod_dual_u235").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_u235");
rod_dual_u238 = new ItemCustomLore().setUnlocalizedName("rod_dual_u238").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_u238");
rod_dual_plutonium = new ItemCustomLore().setUnlocalizedName("rod_dual_plutonium").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_plutonium");
rod_dual_pu238 = new ItemCustomLore().setUnlocalizedName("rod_dual_pu238").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_plutonium");
rod_dual_pu239 = new ItemCustomLore().setUnlocalizedName("rod_dual_pu239").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_plutonium");
rod_dual_pu240 = new ItemCustomLore().setUnlocalizedName("rod_dual_pu240").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_plutonium");
rod_dual_pu238 = new ItemCustomLore().setUnlocalizedName("rod_dual_pu238").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_pu238");
rod_dual_pu239 = new ItemCustomLore().setUnlocalizedName("rod_dual_pu239").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_pu239");
rod_dual_pu240 = new ItemCustomLore().setUnlocalizedName("rod_dual_pu240").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_pu240");
rod_dual_neptunium = new ItemCustomLore().setUnlocalizedName("rod_dual_neptunium").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_neptunium");
rod_dual_lead = new Item().setUnlocalizedName("rod_dual_lead").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_lead");
rod_dual_schrabidium = new ItemCustomLore().setUnlocalizedName("rod_dual_schrabidium").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_schrabidium");
rod_quad_empty = new Item().setUnlocalizedName("rod_quad_empty").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":rod_quad_empty");
rod_quad_uranium = new ItemCustomLore().setUnlocalizedName("rod_quad_uranium").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_uranium");
rod_quad_u235 = new ItemCustomLore().setUnlocalizedName("rod_quad_u235").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_uranium");
rod_quad_u238 = new ItemCustomLore().setUnlocalizedName("rod_quad_u238").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_uranium");
rod_quad_u235 = new ItemCustomLore().setUnlocalizedName("rod_quad_u235").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_u235");
rod_quad_u238 = new ItemCustomLore().setUnlocalizedName("rod_quad_u238").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_u238");
rod_quad_plutonium = new ItemCustomLore().setUnlocalizedName("rod_quad_plutonium").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_plutonium");
rod_quad_pu238 = new ItemCustomLore().setUnlocalizedName("rod_quad_pu238").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_plutonium");
rod_quad_pu239 = new ItemCustomLore().setUnlocalizedName("rod_quad_pu239").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_plutonium");
rod_quad_pu240 = new ItemCustomLore().setUnlocalizedName("rod_quad_pu240").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_plutonium");
rod_quad_pu238 = new ItemCustomLore().setUnlocalizedName("rod_quad_pu238").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_pu238");
rod_quad_pu239 = new ItemCustomLore().setUnlocalizedName("rod_quad_pu239").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_pu239");
rod_quad_pu240 = new ItemCustomLore().setUnlocalizedName("rod_quad_pu240").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_pu240");
rod_quad_neptunium = new ItemCustomLore().setUnlocalizedName("rod_quad_neptunium").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_neptunium");
rod_quad_lead = new Item().setUnlocalizedName("rod_quad_lead").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_lead");
rod_quad_schrabidium = new ItemCustomLore().setUnlocalizedName("rod_quad_schrabidium").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_schrabidium");
rod_uranium_fuel = new ItemFuelRod().setUnlocalizedName("rod_uranium_fuel").setMaxStackSize(1).setMaxDamage(10000).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_uranium");
rod_dual_uranium_fuel = new ItemFuelRod().setUnlocalizedName("rod_dual_uranium_fuel").setMaxStackSize(1).setMaxDamage(20000).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_uranium");
rod_quad_uranium_fuel = new ItemFuelRod().setUnlocalizedName("rod_quad_uranium_fuel").setMaxStackSize(1).setMaxDamage(40000).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_uranium");
rod_plutonium_fuel = new ItemFuelRod().setUnlocalizedName("rod_plutonium_fuel").setMaxStackSize(1).setMaxDamage(25000).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_plutonium");
rod_dual_plutonium_fuel = new ItemFuelRod().setUnlocalizedName("rod_dual_plutonium_fuel").setMaxStackSize(1).setMaxDamage(50000).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_plutonium");
rod_quad_plutonium_fuel = new ItemFuelRod().setUnlocalizedName("rod_quad_plutonium_fuel").setMaxStackSize(1).setMaxDamage(100000).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_plutonium");
rod_uranium_fuel = new ItemFuelRod().setUnlocalizedName("rod_uranium_fuel").setMaxStackSize(1).setMaxDamage(10000).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_uranium_fuel");
rod_dual_uranium_fuel = new ItemFuelRod().setUnlocalizedName("rod_dual_uranium_fuel").setMaxStackSize(1).setMaxDamage(20000).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_uranium_fuel");
rod_quad_uranium_fuel = new ItemFuelRod().setUnlocalizedName("rod_quad_uranium_fuel").setMaxStackSize(1).setMaxDamage(40000).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_uranium_fuel");
rod_plutonium_fuel = new ItemFuelRod().setUnlocalizedName("rod_plutonium_fuel").setMaxStackSize(1).setMaxDamage(25000).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_plutonium_fuel");
rod_dual_plutonium_fuel = new ItemFuelRod().setUnlocalizedName("rod_dual_plutonium_fuel").setMaxStackSize(1).setMaxDamage(50000).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_plutonium_fuel");
rod_quad_plutonium_fuel = new ItemFuelRod().setUnlocalizedName("rod_quad_plutonium_fuel").setMaxStackSize(1).setMaxDamage(100000).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_plutonium_fuel");
rod_mox_fuel = new ItemFuelRod().setUnlocalizedName("rod_mox_fuel").setMaxStackSize(1).setMaxDamage(100000).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_mox_fuel");
rod_dual_mox_fuel = new ItemFuelRod().setUnlocalizedName("rod_dual_mox_fuel").setMaxStackSize(1).setMaxDamage(200000).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_mox_fuel");
rod_quad_mox_fuel = new ItemFuelRod().setUnlocalizedName("rod_quad_mox_fuel").setMaxStackSize(1).setMaxDamage(400000).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_mox_fuel");
@ -1581,6 +1603,10 @@ public class ModItems {
gun_hp = new GunHP().setUnlocalizedName("gun_hp").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_hp");
gun_euthanasia_ammo = new Item().setUnlocalizedName("gun_euthanasia_ammo").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_euthanasia_ammo");
gun_euthanasia = new GunEuthanasia().setUnlocalizedName("gun_euthanasia").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_euthanasia");
gun_dash_ammo = new Item().setUnlocalizedName("gun_dash_ammo").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_dash_ammo");
gun_dash = new GunEuthanasia().setUnlocalizedName("gun_dash").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_dash");
gun_twigun_ammo = new Item().setUnlocalizedName("gun_twigun_ammo").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_twigun_ammo");
gun_twigun = new GunEuthanasia().setUnlocalizedName("gun_twigun").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_twigun");
gun_defabricator_ammo = new Item().setUnlocalizedName("gun_defabricator_ammo").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_defabricator_ammo");
gun_defabricator = new GunDefabricator().setUnlocalizedName("gun_defabricator").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_defabricator");
gun_super_shotgun = new ItemCustomLore().setUnlocalizedName("gun_super_shotgun").setMaxStackSize(1).setFull3D().setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_super_shotgun");
@ -1756,6 +1782,12 @@ public class ModItems {
turret_chip = new ItemTurretChip().setUnlocalizedName("turret_chip").setFull3D().setMaxStackSize(1).setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":turret_chip");
geiger_counter = new ItemGeigerCounter().setUnlocalizedName("geiger_counter").setMaxStackSize(1).setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":geiger_counter");
survey_scanner = new ItemSurveyScanner().setUnlocalizedName("survey_scanner").setMaxStackSize(1).setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":survey_scanner");
turret_light_ammo = new ItemTurretAmmo(ModBlocks.turret_light, 100).setUnlocalizedName("turret_light_ammo").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":turret_light_ammo");
turret_heavy_ammo = new ItemTurretAmmo(ModBlocks.turret_heavy, 25).setUnlocalizedName("turret_heavy_ammo").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":turret_heavy_ammo");
turret_rocket_ammo = new ItemTurretAmmo(ModBlocks.turret_rocket, 8).setUnlocalizedName("turret_rocket_ammo").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":turret_rocket_ammo");
turret_flamer_ammo = new ItemTurretAmmo(ModBlocks.turret_flamer, 200).setUnlocalizedName("turret_flamer_ammo").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":turret_flamer_ammo");
turret_tau_ammo = new ItemTurretAmmo(ModBlocks.turret_tau, 100).setUnlocalizedName("turret_tau_ammo").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":turret_tau_ammo");
template_folder = new ItemTemplateFolder().setUnlocalizedName("template_folder").setMaxStackSize(1).setCreativeTab(MainRegistry.tabMachine).setTextureName(RefStrings.MODID + ":template_folder");
assembly_template = new ItemAssemblyTemplate().setUnlocalizedName("assembly_template").setMaxStackSize(1).setCreativeTab(MainRegistry.tabMachine).setTextureName(RefStrings.MODID + ":assembly_template");
@ -2184,6 +2216,8 @@ public class ModItems {
//Bolts
GameRegistry.registerItem(bolt_dura_steel, bolt_dura_steel.getUnlocalizedName());
GameRegistry.registerItem(bolt_tungsten, bolt_tungsten.getUnlocalizedName());
GameRegistry.registerItem(bolt_compound, bolt_compound.getUnlocalizedName());
//Other Plates
GameRegistry.registerItem(hazmat_cloth, hazmat_cloth.getUnlocalizedName());
@ -2247,7 +2281,9 @@ public class ModItems {
GameRegistry.registerItem(rotor_steel, rotor_steel.getUnlocalizedName());
GameRegistry.registerItem(generator_steel, generator_steel.getUnlocalizedName());
GameRegistry.registerItem(blade_titanium, blade_titanium.getUnlocalizedName());
GameRegistry.registerItem(blade_tungsten, blade_tungsten.getUnlocalizedName());
GameRegistry.registerItem(turbine_titanium, turbine_titanium.getUnlocalizedName());
GameRegistry.registerItem(turbine_tungsten, turbine_tungsten.getUnlocalizedName());
GameRegistry.registerItem(generator_front, generator_front.getUnlocalizedName());
GameRegistry.registerItem(toothpicks, toothpicks.getUnlocalizedName());
GameRegistry.registerItem(ducttape, ducttape.getUnlocalizedName());
@ -2369,6 +2405,7 @@ public class ModItems {
GameRegistry.registerItem(canister_lightoil, canister_lightoil.getUnlocalizedName());
GameRegistry.registerItem(canister_reoil, canister_reoil.getUnlocalizedName());
GameRegistry.registerItem(canister_petroil, canister_petroil.getUnlocalizedName());
GameRegistry.registerItem(canister_biofuel, canister_biofuel.getUnlocalizedName());
GameRegistry.registerItem(canister_napalm, canister_napalm.getUnlocalizedName());
GameRegistry.registerItem(canister_NITAN, canister_NITAN.getUnlocalizedName());
@ -2376,6 +2413,7 @@ public class ModItems {
GameRegistry.registerItem(gas_empty, gas_empty.getUnlocalizedName());
GameRegistry.registerItem(gas_full, gas_full.getUnlocalizedName());
GameRegistry.registerItem(gas_petroleum, gas_petroleum.getUnlocalizedName());
GameRegistry.registerItem(gas_biogas, gas_biogas.getUnlocalizedName());
//Universal Tank
GameRegistry.registerItem(fluid_tank_empty, fluid_tank_empty.getUnlocalizedName());
@ -2636,6 +2674,8 @@ public class ModItems {
GameRegistry.registerItem(gun_spark, gun_spark.getUnlocalizedName());
GameRegistry.registerItem(gun_hp, gun_hp.getUnlocalizedName());
GameRegistry.registerItem(gun_euthanasia, gun_euthanasia.getUnlocalizedName());
GameRegistry.registerItem(gun_dash, gun_dash.getUnlocalizedName());
GameRegistry.registerItem(gun_twigun, gun_twigun.getUnlocalizedName());
GameRegistry.registerItem(gun_defabricator, gun_defabricator.getUnlocalizedName());
GameRegistry.registerItem(gun_super_shotgun, gun_super_shotgun.getUnlocalizedName());
GameRegistry.registerItem(gun_moist_nugget, gun_moist_nugget.getUnlocalizedName());
@ -2668,6 +2708,13 @@ public class ModItems {
GameRegistry.registerItem(gun_defabricator_ammo, gun_defabricator_ammo.getUnlocalizedName());
GameRegistry.registerItem(gun_euthanasia_ammo, gun_euthanasia_ammo.getUnlocalizedName());
//Turret Ammo
GameRegistry.registerItem(turret_light_ammo, turret_light_ammo.getUnlocalizedName());
GameRegistry.registerItem(turret_heavy_ammo, turret_heavy_ammo.getUnlocalizedName());
GameRegistry.registerItem(turret_rocket_ammo, turret_rocket_ammo.getUnlocalizedName());
GameRegistry.registerItem(turret_flamer_ammo, turret_flamer_ammo.getUnlocalizedName());
GameRegistry.registerItem(turret_tau_ammo, turret_tau_ammo.getUnlocalizedName());
//-C-l-i-p-s- Magazines
GameRegistry.registerItem(clip_revolver_iron, clip_revolver_iron.getUnlocalizedName());
GameRegistry.registerItem(clip_revolver, clip_revolver.getUnlocalizedName());

View File

@ -4,7 +4,9 @@ import java.util.List;
import com.hbm.entity.effect.EntityBlackHole;
import com.hbm.entity.effect.EntityCloudFleija;
import com.hbm.entity.effect.EntityVortex;
import com.hbm.entity.logic.EntityNukeExplosionAdvanced;
import com.hbm.entity.logic.EntityNukeExplosionMK3;
import com.hbm.explosion.ExplosionChaos;
import com.hbm.explosion.ExplosionLarge;
import com.hbm.items.ModItems;
@ -41,7 +43,7 @@ public class ItemDrop extends Item {
entityItem.worldObj.playSoundEffect(entityItem.posX, entityItem.posY, entityItem.posZ,
"random.explode", 100.0f, entityItem.worldObj.rand.nextFloat() * 0.1F + 0.9F);
EntityNukeExplosionAdvanced entity = new EntityNukeExplosionAdvanced(entityItem.worldObj);
EntityNukeExplosionMK3 entity = new EntityNukeExplosionMK3(entityItem.worldObj);
entity.posX = entityItem.posX;
entity.posY = entityItem.posY;
entity.posZ = entityItem.posZ;
@ -61,56 +63,32 @@ public class ItemDrop extends Item {
}
if (stack.getItem() != null && stack.getItem() == ModItems.singularity) {
if (!entityItem.worldObj.isRemote) {
entityItem.worldObj.playSoundEffect(entityItem.posX, entityItem.posY, entityItem.posZ,
"random.explode", 100.0f, entityItem.worldObj.rand.nextFloat() * 0.1F + 0.9F);
EntityNukeExplosionAdvanced entity = new EntityNukeExplosionAdvanced(entityItem.worldObj);
entity.posX = entityItem.posX;
entity.posY = entityItem.posY;
entity.posZ = entityItem.posZ;
entity.destructionRange = MainRegistry.aSchrabRadius;
entity.speed = 25;
entity.coefficient = 0.01F;
entity.coefficient2 = 0.01F;
entity.waste = false;
entityItem.worldObj.spawnEntityInWorld(entity);
EntityVortex bl = new EntityVortex(entityItem.worldObj, 1.5F);
bl.posX = entityItem.posX ;
bl.posY = entityItem.posY ;
bl.posZ = entityItem.posZ ;
entityItem.worldObj.spawnEntityInWorld(bl);
}
}
if (stack.getItem() != null && stack.getItem() == ModItems.singularity_counter_resonant) {
if (!entityItem.worldObj.isRemote) {
entityItem.worldObj.playSoundEffect(entityItem.posX, entityItem.posY, entityItem.posZ,
"random.explode", 100.0f, entityItem.worldObj.rand.nextFloat() * 0.1F + 0.9F);
EntityNukeExplosionAdvanced entity = new EntityNukeExplosionAdvanced(entityItem.worldObj);
entity.posX = entityItem.posX;
entity.posY = entityItem.posY;
entity.posZ = entityItem.posZ;
entity.destructionRange = MainRegistry.aSchrabRadius * 2;
entity.speed = 25;
entity.coefficient = 0.01F;
entity.coefficient2 = 0.01F;
entity.waste = false;
entityItem.worldObj.spawnEntityInWorld(entity);
EntityVortex bl = new EntityVortex(entityItem.worldObj, 2.5F);
bl.posX = entityItem.posX ;
bl.posY = entityItem.posY ;
bl.posZ = entityItem.posZ ;
entityItem.worldObj.spawnEntityInWorld(bl);
}
}
if (stack.getItem() != null && stack.getItem() == ModItems.singularity_super_heated) {
if (!entityItem.worldObj.isRemote) {
entityItem.worldObj.playSoundEffect(entityItem.posX, entityItem.posY, entityItem.posZ,
"random.explode", 100.0f, entityItem.worldObj.rand.nextFloat() * 0.1F + 0.9F);
EntityNukeExplosionAdvanced entity = new EntityNukeExplosionAdvanced(entityItem.worldObj);
entity.posX = entityItem.posX;
entity.posY = entityItem.posY;
entity.posZ = entityItem.posZ;
entity.destructionRange = MainRegistry.aSchrabRadius * 2;
entity.speed = 25;
entity.coefficient = 0.01F;
entity.coefficient2 = 0.01F;
entity.waste = false;
entityItem.worldObj.spawnEntityInWorld(entity);
EntityVortex bl = new EntityVortex(entityItem.worldObj, 2.5F);
bl.posX = entityItem.posX ;
bl.posY = entityItem.posY ;
bl.posZ = entityItem.posZ ;
entityItem.worldObj.spawnEntityInWorld(bl);
}
}
if (stack.getItem() != null && stack.getItem() == ModItems.black_hole) {
@ -130,7 +108,7 @@ public class ItemDrop extends Item {
entityItem.worldObj.spawnEntityInWorld(entity);*/
EntityBlackHole bl = new EntityBlackHole(entityItem.worldObj, 0.5F);
EntityBlackHole bl = new EntityBlackHole(entityItem.worldObj, 1.5F);
bl.posX = entityItem.posX ;
bl.posY = entityItem.posY ;
bl.posZ = entityItem.posZ ;

View File

@ -123,11 +123,13 @@ public class ItemAssemblyTemplate extends Item {
RF_TO_HE,
SHREDDER,
DERRICK,
PUMPJACK,
FLARE_STACK,
REFINERY,
CHEMPLANT,
TANK,
MINER,
TURBOFAN,
TELEPORTER,
SCHRABTRANS,
CMB_FURNACE,
@ -136,6 +138,7 @@ public class ItemAssemblyTemplate extends Item {
FA_CORE,
FA_PORT,
LR_ELEMENT,
LR_CONTROL,
LR_HATCH,
LR_PORT,
LR_CORE,
@ -169,6 +172,11 @@ public class ItemAssemblyTemplate extends Item {
BOMB_EXO,
LAUNCH_PAD,
HUNTER_CHOPPER,
TURRET_LIGHT,
TURRET_HEAVY,
TURRET_ROCKET,
TURRET_FLAMER,
TURRET_TAU,
MISSILE_HE_1,
MISSILE_FIRE_1,
MISSILE_CLUSTER_1,
@ -190,7 +198,6 @@ public class ItemAssemblyTemplate extends Item {
MINI_MIRV,
DARK_PLUG,
COMBINE_BALL,
GREANADE_ENHANCED,
GRENADE_FLAME,
GRENADE_SHRAPNEL,
GRENAGE_CLUSTER,
@ -496,6 +503,8 @@ public class ItemAssemblyTemplate extends Item {
return 200;
case DERRICK:
return 250;
case PUMPJACK:
return 400;
case FLARE_STACK:
return 200;
case REFINERY:
@ -506,6 +515,8 @@ public class ItemAssemblyTemplate extends Item {
return 150;
case MINER:
return 200;
case TURBOFAN:
return 500;
case TELEPORTER:
return 300;
case SCHRABTRANS:
@ -522,6 +533,8 @@ public class ItemAssemblyTemplate extends Item {
return 50;
case LR_ELEMENT:
return 150;
case LR_CONTROL:
return 100;
case LR_HATCH:
return 150;
case LR_PORT:
@ -586,6 +599,16 @@ public class ItemAssemblyTemplate extends Item {
return 250;
case LAUNCH_PAD:
return 250;
case TURRET_LIGHT:
return 200;
case TURRET_HEAVY:
return 250;
case TURRET_ROCKET:
return 300;
case TURRET_FLAMER:
return 250;
case TURRET_TAU:
return 350;
case HUNTER_CHOPPER:
return 300;
case MISSILE_HE_1:
@ -630,8 +653,6 @@ public class ItemAssemblyTemplate extends Item {
return 50;
case COMBINE_BALL:
return 200;
case GREANADE_ENHANCED:
return 150;
case GRENADE_FLAME:
return 150;
case GRENADE_SHRAPNEL:

View File

@ -67,7 +67,8 @@ public class ItemChemistryTemplate extends Item {
DEUTERIUM,
STEAM,
UF6,
PUF6;
PUF6,
SAS3;
public static EnumChemistryTemplate getEnum(int i) {
if(i < EnumChemistryTemplate.values().length)
@ -201,6 +202,12 @@ public class ItemChemistryTemplate extends Item {
return 200;
case BP_BIOFUEL:
return 100;
case UF6:
return 100;
case PUF6:
return 150;
case SAS3:
return 200;
default:
return 100;
}

View File

@ -8,6 +8,7 @@ import com.hbm.blocks.ModBlocks;
import net.minecraft.block.Block;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
@ -132,5 +133,13 @@ public class ItemGeigerCounter extends Item {
return i * level;
}
/*@Override
public boolean onItemUse(ItemStack p_77648_1_, EntityPlayer player, World world, int p_77648_4_, int p_77648_5_, int p_77648_6_, int p_77648_7_, float p_77648_8_, float p_77648_9_, float p_77648_10_)
{
if(!world.isRemote)
player.travelToDimension(1);
return true;
}*/
}

View File

@ -166,9 +166,9 @@ public class ItemTurretControl extends Item {
if(te != null && te instanceof TileEntityTurretBase) {
TileEntityTurretBase turret = (TileEntityTurretBase)te;
if(!turret.isAI) {
((TurretBase)world.getBlock(x, y, z)).executeHoldAction(world, stack.getMaxItemUseDuration() - count, player.rotationYaw, player.rotationPitch, x, y, z);
if(!turret.isAI && turret.ammo > 0) {
if(((TurretBase)world.getBlock(x, y, z)).executeHoldAction(world, stack.getMaxItemUseDuration() - count, player.rotationYaw, player.rotationPitch, x, y, z))
turret.ammo--;
}
}
}

View File

@ -0,0 +1,42 @@
package com.hbm.items.weapon;
import com.hbm.items.ModItems;
import com.hbm.tileentity.bomb.TileEntityTurretBase;
import net.minecraft.block.Block;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
public class ItemTurretAmmo extends Item {
Block turret;
int count;
public ItemTurretAmmo(Block turret, int count) {
this.turret = turret;
this.count = count;
}
@Override
public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int i, float f0, float f1, float f2)
{
if(player.isSneaking())
return false;
if(world.getBlock(x, y, z) == turret) {
if(world.getTileEntity(x, y, z) instanceof TileEntityTurretBase) {
((TileEntityTurretBase)world.getTileEntity(x, y, z)).ammo += count;
player.inventory.consumeInventoryItem(this);
world.playSoundAtEntity(player, "hbm:weapon.reloadTurret", 1.0F, 1.0F);
}
return true;
}
return false;
}
}

Some files were not shown because too many files have changed in this diff Show More