diff options
| author | Evan Goers <mega@osirion.org> | 2011-08-11 05:32:19 +0000 |
|---|---|---|
| committer | Evan Goers <mega@osirion.org> | 2011-08-11 05:32:19 +0000 |
| commit | f1e4868dbac3eebc1b036786c5355fade2ef69cd (patch) | |
| tree | 1d6b9041632912d7ddcefe9a70cdd662f9cbb473 | |
| parent | 38503c1eaba7ffd1fd5907de6b937e26e1259389 (diff) | |
Added diamonds commodity model, enabled in the cargo.ini.
| -rw-r--r-- | base/ini/cargo.ini | 1 | ||||
| -rw-r--r-- | base/materials/commodities.shader | 8 | ||||
| -rw-r--r-- | base/models/cargo/diamonds/diamonds.map | 81 | ||||
| -rw-r--r-- | base/textures/commodities/diamonds.png | bin | 0 -> 47789 bytes |
4 files changed, 90 insertions, 0 deletions
diff --git a/base/ini/cargo.ini b/base/ini/cargo.ini index f1eefa4..a8bd085 100644 --- a/base/ini/cargo.ini +++ b/base/ini/cargo.ini @@ -34,6 +34,7 @@ info=It does not oxidize like regular durasteel and is widely used for anything [cargo]
label=diamonds
name=Diamonds
+model=models/cargo/diamonds/diamonds
volume=1
info=Diamonds are a girl's best friend forever.
diff --git a/base/materials/commodities.shader b/base/materials/commodities.shader index 106b68d..4e06843 100644 --- a/base/materials/commodities.shader +++ b/base/materials/commodities.shader @@ -5,3 +5,11 @@ textures/commodities/crystals texture textures/commodities/crystals environment } + +textures/commodities/diamonds +{ + qer_editorimage textures/commodities/diamonds + color 1.00 1.00 1.00 + texture textures/commodities/diamonds + environment +} diff --git a/base/models/cargo/diamonds/diamonds.map b/base/models/cargo/diamonds/diamonds.map new file mode 100644 index 0000000..834f0d8 --- /dev/null +++ b/base/models/cargo/diamonds/diamonds.map @@ -0,0 +1,81 @@ + +// entity 0 +{ +"classname" "worldspawn" +// brush 0 +{ +( -7 64 87 ) ( 7 64 -41 ) ( 7 64 87 ) commodities/diamonds 0 0 0 0.5 0.5 0 0 0 +( 0 0 -41 ) ( 7 64 23 ) ( -7 64 23 ) commodities/diamonds 0 0 0 0.5 0.5 0 0 0 +( 7 64 87 ) ( 7 64 -41 ) ( 16 62 87 ) commodities/diamonds 0 0 0 0.5 0.5 0 0 0 +( 16 62 87 ) ( 16 62 -41 ) ( 32 56 87 ) commodities/diamonds 0 0 0 0.5 0.5 0 0 0 +( 32 56 87 ) ( 32 56 -41 ) ( 39 51 87 ) commodities/diamonds 0 0 0 0.5 0.5 0 0 0 +( 39 51 87 ) ( 39 51 -41 ) ( 51 39 87 ) commodities/diamonds 0 0 0 0.5 0.5 0 0 0 +( 51 39 23 ) ( 39 51 23 ) ( 0 0 -41 ) commodities/diamonds 0 0 0 0.5 0.5 0 0 0 +( 7 64 25 ) ( 0 48 41 ) ( -7 64 25 ) commodities/diamonds 0 0 0 0.5 0.5 0 0 0 +( -48 0 41 ) ( 0 48 41 ) ( 0 -48 41 ) commodities/diamonds 0 0 0 0.5 0.5 0 0 0 +( 7 64 25 ) ( 9 46 41 ) ( 0 48 41 ) commodities/diamonds 0 0 0 0.5 0.5 0 0 0 +( 32 56 25 ) ( 25 40 41 ) ( 9 46 41 ) commodities/diamonds 0 0 0 0.5 0.5 0 0 0 +( 39 51 25 ) ( 32 35 41 ) ( 25 40 41 ) commodities/diamonds 0 0 0 0.5 0.5 0 0 0 +( 39 51 25 ) ( 35 32 41 ) ( 32 35 41 ) commodities/diamonds 0 0 0 0.5 0.5 0 0 0 +( -16 62 87 ) ( -7 64 -41 ) ( -7 64 87 ) commodities/diamonds 0 0 0 0.5 0.5 0 0 0 +( -32 56 87 ) ( -16 62 -41 ) ( -16 62 87 ) commodities/diamonds 0 0 0 0.5 0.5 0 0 0 +( -39 51 87 ) ( -32 56 -41 ) ( -32 56 87 ) commodities/diamonds 0 0 0 0.5 0.5 0 0 0 +( -51 39 87 ) ( -39 51 -41 ) ( -39 51 87 ) commodities/diamonds 0 0 0 0.5 0.5 0 0 0 +( 0 0 -41 ) ( -39 51 23 ) ( -51 39 23 ) commodities/diamonds 0 0 0 0.5 0.5 0 0 0 +( -7 64 25 ) ( 0 48 41 ) ( -9 46 41 ) commodities/diamonds 0 0 0 0.5 0.5 0 0 0 +( -16 62 25 ) ( -9 46 41 ) ( -25 40 41 ) commodities/diamonds 0 0 0 0.5 0.5 0 0 0 +( -39 51 25 ) ( -25 40 41 ) ( -32 35 41 ) commodities/diamonds 0 0 0 0.5 0.5 0 0 0 +( -51 39 25 ) ( -32 35 41 ) ( -35 32 41 ) commodities/diamonds 0 0 0 0.5 0.5 0 0 0 +( -64 -7 87 ) ( -64 7 -41 ) ( -64 7 87 ) commodities/diamonds 0 0 0 0.5 0.5 0 0 0 +( 0 0 -41 ) ( -64 7 23 ) ( -64 -7 23 ) commodities/diamonds 0 0 0 0.5 0.5 0 0 0 +( -64 7 87 ) ( -64 7 -41 ) ( -62 16 87 ) commodities/diamonds 0 0 0 0.5 0.5 0 0 0 +( -62 16 87 ) ( -62 16 -41 ) ( -56 32 87 ) commodities/diamonds 0 0 0 0.5 0.5 0 0 0 +( -56 32 87 ) ( -56 32 -41 ) ( -51 39 87 ) commodities/diamonds 0 0 0 0.5 0.5 0 0 0 +( -64 7 25 ) ( -48 0 41 ) ( -64 -7 25 ) commodities/diamonds 0 0 0 0.5 0.5 0 0 0 +( -62 16 25 ) ( -46 9 41 ) ( -48 0 41 ) commodities/diamonds 0 0 0 0.5 0.5 0 0 0 +( -62 16 25 ) ( -40 25 41 ) ( -46 9 41 ) commodities/diamonds 0 0 0 0.5 0.5 0 0 0 +( -56 32 25 ) ( -35 32 41 ) ( -40 25 41 ) commodities/diamonds 0 0 0 0.5 0.5 0 0 0 +( -62 -16 87 ) ( -64 -7 -41 ) ( -64 -7 87 ) commodities/diamonds 0 0 0 0.5 0.5 0 0 0 +( -56 -32 87 ) ( -62 -16 -41 ) ( -62 -16 87 ) commodities/diamonds 0 0 0 0.5 0.5 0 0 0 +( -51 -39 87 ) ( -56 -32 -41 ) ( -56 -32 87 ) commodities/diamonds 0 0 0 0.5 0.5 0 0 0 +( -39 -51 87 ) ( -51 -39 -41 ) ( -51 -39 87 ) commodities/diamonds 0 0 0 0.5 0.5 0 0 0 +( 0 0 -41 ) ( -51 -39 23 ) ( -39 -51 23 ) commodities/diamonds 0 0 0 0.5 0.5 0 0 0 +( -64 -7 25 ) ( -48 0 41 ) ( -46 -9 41 ) commodities/diamonds 0 0 0 0.5 0.5 0 0 0 +( -56 -32 25 ) ( -46 -9 41 ) ( -40 -25 41 ) commodities/diamonds 0 0 0 0.5 0.5 0 0 0 +( -51 -39 25 ) ( -40 -25 41 ) ( -35 -32 41 ) commodities/diamonds 0 0 0 0.5 0.5 0 0 0 +( -39 -51 25 ) ( -35 -32 41 ) ( -32 -35 41 ) commodities/diamonds 0 0 0 0.5 0.5 0 0 0 +( 7 -64 87 ) ( -7 -64 -41 ) ( -7 -64 87 ) commodities/diamonds 0 0 0 0.5 0.5 0 0 0 +( 0 0 -41 ) ( -7 -64 23 ) ( 7 -64 23 ) commodities/diamonds 0 0 0 0.5 0.5 0 0 0 +( -7 -64 87 ) ( -7 -64 -41 ) ( -16 -62 87 ) commodities/diamonds 0 0 0 0.5 0.5 0 0 0 +( -16 -62 87 ) ( -16 -62 -41 ) ( -32 -56 87 ) commodities/diamonds 0 0 0 0.5 0.5 0 0 0 +( -32 -56 87 ) ( -32 -56 -41 ) ( -39 -51 87 ) commodities/diamonds 0 0 0 0.5 0.5 0 0 0 +( -7 -64 25 ) ( 0 -48 41 ) ( 7 -64 25 ) commodities/diamonds 0 0 0 0.5 0.5 0 0 0 +( -16 -62 25 ) ( -9 -46 41 ) ( 0 -48 41 ) commodities/diamonds 0 0 0 0.5 0.5 0 0 0 +( -32 -56 25 ) ( -25 -40 41 ) ( -9 -46 41 ) commodities/diamonds 0 0 0 0.5 0.5 0 0 0 +( -39 -51 25 ) ( -32 -35 41 ) ( -25 -40 41 ) commodities/diamonds 0 0 0 0.5 0.5 0 0 0 +( 16 -62 87 ) ( 7 -64 -41 ) ( 7 -64 87 ) commodities/diamonds 0 0 0 0.5 0.5 0 0 0 +( 32 -56 87 ) ( 16 -62 -41 ) ( 16 -62 87 ) commodities/diamonds 0 0 0 0.5 0.5 0 0 0 +( 39 -51 87 ) ( 32 -56 -41 ) ( 32 -56 87 ) commodities/diamonds 0 0 0 0.5 0.5 0 0 0 +( 51 -39 87 ) ( 39 -51 -41 ) ( 39 -51 87 ) commodities/diamonds 0 0 0 0.5 0.5 0 0 0 +( 0 0 -41 ) ( 39 -51 23 ) ( 51 -39 23 ) commodities/diamonds 0 0 0 0.5 0.5 0 0 0 +( 7 -64 25 ) ( 0 -48 41 ) ( 9 -46 41 ) commodities/diamonds 0 0 0 0.5 0.5 0 0 0 +( 16 -62 25 ) ( 9 -46 41 ) ( 25 -40 41 ) commodities/diamonds 0 0 0 0.5 0.5 0 0 0 +( 39 -51 25 ) ( 25 -40 41 ) ( 32 -35 41 ) commodities/diamonds 0 0 0 0.5 0.5 0 0 0 +( 51 -39 25 ) ( 32 -35 41 ) ( 35 -32 41 ) commodities/diamonds 0 0 0 0.5 0.5 0 0 0 +( 64 7 87 ) ( 64 -7 -41 ) ( 64 -7 87 ) commodities/diamonds 0 0 0 0.5 0.5 0 0 0 +( 0 0 -41 ) ( 64 -7 23 ) ( 64 7 23 ) commodities/diamonds 0 0 0 0.5 0.5 0 0 0 +( 64 -7 87 ) ( 64 -7 -41 ) ( 62 -16 87 ) commodities/diamonds 0 0 0 0.5 0.5 0 0 0 +( 62 -16 87 ) ( 62 -16 -41 ) ( 56 -32 87 ) commodities/diamonds 0 0 0 0.5 0.5 0 0 0 +( 56 -32 87 ) ( 56 -32 -41 ) ( 51 -39 87 ) commodities/diamonds 0 0 0 0.5 0.5 0 0 0 +( 64 -7 25 ) ( 48 0 41 ) ( 64 7 25 ) commodities/diamonds 0 0 0 0.5 0.5 0 0 0 +( 64 -7 25 ) ( 46 -9 41 ) ( 48 0 41 ) commodities/diamonds 0 0 0 0.5 0.5 0 0 0 +( 56 -32 25 ) ( 40 -25 41 ) ( 46 -9 41 ) commodities/diamonds 0 0 0 0.5 0.5 0 0 0 +( 56 -32 25 ) ( 35 -32 41 ) ( 40 -25 41 ) commodities/diamonds 0 0 0 0.5 0.5 0 0 0 +( 62 16 87 ) ( 64 7 -41 ) ( 64 7 87 ) commodities/diamonds 0 0 0 0.5 0.5 0 0 0 +( 56 32 87 ) ( 62 16 -41 ) ( 62 16 87 ) commodities/diamonds 0 0 0 0.5 0.5 0 0 0 +( 51 39 87 ) ( 56 32 -41 ) ( 56 32 87 ) commodities/diamonds 0 0 0 0.5 0.5 0 0 0 +( 62 16 25 ) ( 48 0 41 ) ( 46 9 41 ) commodities/diamonds 0 0 0 0.5 0.5 0 0 0 +( 56 32 25 ) ( 46 9 41 ) ( 40 25 41 ) commodities/diamonds 0 0 0 0.5 0.5 0 0 0 +( 51 39 25 ) ( 40 25 41 ) ( 35 32 41 ) commodities/diamonds 0 0 0 0.5 0.5 0 0 0 +} +} diff --git a/base/textures/commodities/diamonds.png b/base/textures/commodities/diamonds.png Binary files differnew file mode 100644 index 0000000..10e6bac --- /dev/null +++ b/base/textures/commodities/diamonds.png |
