Updated trade definitions, added racetrack to the Phoenicia system, added medicines model.

14 files changed, 454 insertions, 39 deletions

diff --git a/base/ini/cargo.ini b/base/ini/cargo.ini
index a330724..2b8a8e7 100644
--- a/base/ini/cargo.ini
+++ b/base/ini/cargo.ini
@@ -29,6 +29,7 @@ info=A base component in optronic processing, anisotropic crystals are used to r
 label=carbosteel

 name=Carbosteel

 model=models/cargo/carbosteel/carbosteel

+price=275

 volume=1

 info=The result of a metallurgic process to reinforce durasteel with carbon nano-fibres, carbosteel is a lightweight yet durable alloy capable of surviving exposure to extreme conditions.

 info=It does not oxidize like regular durasteel and is widely used for anything from self-sealing stem bolts to ship hulls.

@@ -123,7 +124,7 @@ volume=4
 [cargo]

 label=medicines

 name=Medicines

-info=Medicines are an integral to the success of all known races.

-info=Dwellers of the border worlds still suffer from acute infection rates and will pay highly for medicinal supplies.

+model=models/cargo/medicines/medicines

+info=Medicines are an integral component of a long life and good health. Due to supply problems and the lack of nearby medical facilities, remote locations will pay highly for medicinal supplies.

 price=225

 volume=1

diff --git a/base/ini/factions.ini b/base/ini/factions.ini
index 569fcda..df93078 100644
--- a/base/ini/factions.ini
+++ b/base/ini/factions.ini
@@ -66,7 +66,7 @@ color=106 95 87
 label=mercenaries
 name=Mercenaries Guild
 
-[factiom]
+[faction]
 label=merchants
 name=Merchants Association
 
diff --git a/base/ini/weapons.ini b/base/ini/weapons.ini
index 16e2097..3444d8c 100644
--- a/base/ini/weapons.ini
+++ b/base/ini/weapons.ini
@@ -32,18 +32,28 @@ damage=250
 ; CANNONS
 ;
 
+; ------------------------------------------------------------------
+; blasters are used by the Colonial Militia
+
 [cannon]
 label=blaster1
 name=Blaster cannon
 info=Basic pewpew
 price=2500
-level=2
+level=1
 
 	[projectile]
+	; speed of a projectile generated by this weapon, in meters per second
 	speed=2000
-	lifespan=4500
-	damage=5
+	; interval between two consecutive shots, in milliseconds
 	interval=100
+	; range is the distance a projectile can travel before it dies, in meters
+	range=9000
+	; lifespan of a single projectile, in milliseconds (setting range sets lifespan)
+	; lifespan=5000
+	; damage done by the projectile
+	damage=5
+	; projectile model
 	model=blaster1
 
 [cannon]
@@ -54,12 +64,22 @@ price=10000
 level=8
 
 	[projectile]
+	; speed of a projectile generated by this weapon, in meters per second
 	speed=2000
-	lifespan=4500
-	damage=15
+	; interval between two consecutive shots, in milliseconds
 	interval=100
+	; range is the distance a projectile can travel before it dies, in meters
+	range=9000
+	; lifespan of a single projectile, in milliseconds (setting range sets lifespan)
+	; lifespan=5000
+	; damage done by the projectile
+	damage=15
+	; projectile model
 	model=blaster2
-	
+
+; ------------------------------------------------------------------
+; lasers are used by Merchants
+
 [cannon]
 label=laser1
 name=Laser cannon
@@ -73,8 +93,10 @@ level=1
 	speed=1500
 	; interval between two consecutive shots, in milliseconds
 	interval=500
-	; lifespan of a single projectile, in milliseconds
-	lifespan=5000
+	; range is the distance a projectile can travel before it dies, in meters
+	range=7500
+	; lifespan of a single projectile, in milliseconds (setting range sets lifespan)
+	; lifespan=5000
 	; damage done by the projectile
 	damage=10
 	; projectile model	
@@ -91,8 +113,10 @@ level=5
 	speed=1500
 	; interval between two consecutive shots, in milliseconds
 	interval=500
-	; lifespan of a single projectile, in milliseconds
-	lifespan=5000
+	; range is the distance a projectile can travel before it dies, in meters
+	range=7500
+	; lifespan of a single projectile, in milliseconds (setting range sets lifespan)
+	; lifespan=5000
 	; damage done by the projectile
 	damage=15
 	; projectile model	
@@ -109,8 +133,10 @@ level=15
 	speed=1500
 	; interval between two consecutive shots, in milliseconds
 	interval=500
-	; lifespan of a single projectile, in milliseconds
-	lifespan=5000
+	; range is the distance a projectile can travel before it dies, in meters
+	range=7500
+	; lifespan of a single projectile, in milliseconds (setting range sets lifespan)
+	;lifespan=5000
 	; damage done by the projectile
 	damage=25
 	; projectile model	
@@ -127,8 +153,10 @@ level=25
 	speed=1250
 	; interval between two consecutive shots, in milliseconds
 	interval=1000
-	; lifespan of a single projectile, in milliseconds
-	lifespan=5000
+	; range is the distance a projectile can travel before it dies, in meters
+	range=8000
+	; lifespan of a single projectile, in milliseconds (setting range sets lifespan)
+	;lifespan=5000
 	; damage done by the projectile
 	damage=25
 	; projectile model	
@@ -145,8 +173,10 @@ level=20
 	speed=1300
 	; interval between two consecutive shots, in milliseconds
 	interval=800
-	; lifespan of a single projectile, in milliseconds
-	lifespan=7000
+	; range is the distance a projectile can travel before it dies, in meters
+	range=8500
+	; lifespan of a single projectile, in milliseconds (setting range sets lifespan)
+	;lifespan=7000
 	; damage done by the projectile
 	damage=200
 	; projectile model	
diff --git a/base/ini/world.ini b/base/ini/world.ini
index bfcc78e..21e5d3b 100644
--- a/base/ini/world.ini
+++ b/base/ini/world.ini
@@ -46,7 +46,8 @@ zone=phoenicia
 ; dragon eye nebula
 zone=argos
 zone=gibraltar
-zone=colombus 
+zone=colombus
+zone=camorra
 
 ; tsu-khan space
 zone=kiana
diff --git a/base/ini/zones/albion.ini b/base/ini/zones/albion.ini
index 0415a31..8dc4703 100644
--- a/base/ini/zones/albion.ini
+++ b/base/ini/zones/albion.ini
@@ -34,14 +34,12 @@ pitch=5
 dock=yes
 location=-224 0 0
 yaw=140
+info=Planet Albion is the home of the Albion University.
 
 	[cargo]
-	label=carbosteel
-	price=300
-
-	[cargo]
-	label=iron
-	price=250
+	label=medicines
+	price=200
+	amount=-1
 
 	[cargo]
 	label=water
@@ -71,15 +69,11 @@ radius=8
 yaw=30
 
 	[cargo]
-	label=gold
-	price=1200
-	amount=0
-
+	label=iron
+	
 	[cargo]
-	label=diamonds
-	price=2300
-	amount=0
-
+	label=carbosteel
+	
 ; ------------------------------------------------------------------ 
 ; LINDBLADE JUMPGATE
 
diff --git a/base/ini/zones/anara.ini b/base/ini/zones/anara.ini
index c6e26d7..77b9e7d 100644
--- a/base/ini/zones/anara.ini
+++ b/base/ini/zones/anara.ini
@@ -44,6 +44,11 @@ location=128 768 32
 	label=liquor
 	price=500
 	amount=0
+	
+	[cargo]
+	label=medicines
+	price=350
+	amount=0
 
 	[cargo]
 	label=water
diff --git a/base/ini/zones/argos.ini b/base/ini/zones/argos.ini
index 17bb935..4f331a7 100644
--- a/base/ini/zones/argos.ini
+++ b/base/ini/zones/argos.ini
@@ -2,22 +2,24 @@
 ; argos.ini
 ; world description for the Argos system
 ;
-
 ; ------------------------------------------------------------------
 ; ZONE IDENTIFICATION
 ;
+
 [zone]
 name=Argos system
 sky=sky19
 ; [x y z] galactic location
 location=629 451 0
 ambient=0.1 0.1 0.1
-info=The Argos system.
 faction=neutral
 
+info=The Argos system.
+
 ; ------------------------------------------------------------------
 ; MORRIGAN JUMPGATE
 ;
+
 [jumpgate]
 label=jumpgate_morrigan
 location=-348 740 0
@@ -28,16 +30,30 @@ faction=neutral
 ; ------------------------------------------------------------------
 ; HELLAS JUMPGATE
 ;
+
 [jumpgate]
 label=jumpgate_hellas
 location=-952 -180 0
-
+target=hellas:jumpgate_argos
+faction=neutral
 ; ------------------------------------------------------------------
 ; GIBRALTAR JUMPPOINT
 ;
+
 [jumppoint]
 label=jumppoint_gibraltar
 location=1080 200 0
 angles=0 195 0
 target=gibraltar:jumppoint_argos
 
+; ------------------------------------------------------------------
+; MORRIGAN JUMPGATE
+;
+
+[jumpgate]
+label=jumpgate_colombus
+location=188 -1228 0
+angles=0 95 0
+target=colombus:jumpgate_argos
+faction=neutral
+
diff --git a/base/ini/zones/caledonia.ini b/base/ini/zones/caledonia.ini
index 3922bf5..bdfc075 100644
--- a/base/ini/zones/caledonia.ini
+++ b/base/ini/zones/caledonia.ini
@@ -77,3 +77,9 @@ location=320 -40 0
 angles=8 180 0
 texture=planets/caledonia
 dock=yes
+
+	[cargo]
+	label=medicines
+	price=275
+	amount=0
+	
diff --git a/base/ini/zones/colombus.ini b/base/ini/zones/colombus.ini
index c8c06c8..d7fcd54 100644
--- a/base/ini/zones/colombus.ini
+++ b/base/ini/zones/colombus.ini
@@ -2,15 +2,29 @@
 ; colombus.ini
 ; world description for the Colombus system
 ;
-
 ; ------------------------------------------------------------------
 ; ZONE IDENTIFICATION
 ;
+
 [zone]
 name=Colombus system
 sky=sky20
 ; [x y z] galactic location
 location=709 442 0
 ambient=0.1 0.1 0.1
+faction=neutral
+
 info=The Colombus system.
-faction=neutral
\ No newline at end of file
+
+[jumpgate]
+label=jumpgate_argos
+location=-56 1080 -8
+angles=0 -80 0
+target=argos:jumpgate_colombus
+faction=neutral
+[jumpgate]
+label=jumpgate_camorra
+location=320 -1200 -8
+angles=0 100 0
+target=camorra:jumpgate_colombus
+faction=neutral
diff --git a/base/ini/zones/hellas.ini b/base/ini/zones/hellas.ini
index bdc77cd..04d1e68 100644
--- a/base/ini/zones/hellas.ini
+++ b/base/ini/zones/hellas.ini
@@ -22,3 +22,10 @@ angles=0 -25 0
 target=eastend:jumpgate_hellas
 faction=praetoria
 
+[jumpgate]
+label=jumpgate_argos
+location=960 -80 8
+angles=0 -180 0
+target=argos:jumpgate_hellas
+faction=praetoria
+
diff --git a/base/ini/zones/phoenicia.ini b/base/ini/zones/phoenicia.ini
index 1d843cf..d2ad897 100644
--- a/base/ini/zones/phoenicia.ini
+++ b/base/ini/zones/phoenicia.ini
@@ -17,3 +17,40 @@ faction=praetoria
 
 ; zone information
 info=The Phoenicia system.
+
+
+[racetrack]
+label=racetrack
+name=Race Start
+model=maps/race/checkpoint
+location=64 0 0
+yaw=180
+color=.5 .5 .5
+
+[checkpoint]
+label=checkpoint1
+name=Checkpoint 1
+model=maps/race/checkpoint
+location=96 0 0
+yaw=180
+
+[checkpoint]
+label=checkpoint2
+name=Checkpoint 2
+model=maps/race/checkpoint
+location=128 0 4
+yaw=180
+
+[checkpoint]
+label=checkpoint3
+name=Checkpoint 3
+model=maps/race/checkpoint
+location=138 -10 4
+yaw=135
+
+[checkpoint]
+label=checkpoint4
+name=Race Finish
+model=maps/race/checkpoint
+location=138 -28 4
+yaw=90
diff --git a/base/models/cargo/medicines/end.jpg b/base/models/cargo/medicines/end.jpg
new file mode 100644
index 0000000..6c41136
--- /dev/null
+++ b/base/models/cargo/medicines/end.jpg
diff --git a/base/models/cargo/medicines/medicines.obj b/base/models/cargo/medicines/medicines.obj
new file mode 100644
index 0000000..4e6a4dc
--- /dev/null
+++ b/base/models/cargo/medicines/medicines.obj
@@ -0,0 +1,304 @@
+v  30.0000 -143.6713 -0.0000
+v  25.9808 -143.6713 -15.0000
+v  25.9808 5.4007 -15.0000
+v  30.0000 5.4007 0.0000
+v  15.0000 -143.6713 -25.9808
+v  15.0000 5.4007 -25.9808
+v  -0.0000 -143.6713 -30.0000
+v  -0.0000 5.4007 -30.0000
+v  -15.0000 -143.6713 -25.9808
+v  -15.0000 5.4007 -25.9808
+v  -25.9808 -143.6713 -15.0000
+v  -25.9808 5.4007 -15.0000
+v  -30.0000 -143.6713 -0.0000
+v  -30.0000 5.4007 -0.0000
+v  -25.9808 -143.6713 15.0000
+v  -25.9808 5.4007 15.0000
+v  -15.0000 -143.6713 25.9808
+v  -15.0000 5.4007 25.9808
+v  -0.0000 -143.6713 30.0000
+v  -0.0000 5.4007 30.0000
+v  15.0000 -143.6713 25.9808
+v  15.0000 5.4007 25.9808
+v  25.9808 -143.6713 15.0000
+v  25.9808 5.4007 15.0000
+v  -0.0000 20.3887 0.0000
+v  -0.0000 18.3807 15.0000
+v  15.0000 18.3807 0.0000
+v  -0.0000 12.8947 25.9808
+v  16.4317 14.8799 16.4317
+v  25.9808 12.8947 0.0000
+v  -15.0000 18.3807 0.0000
+v  -25.9808 12.8947 0.0000
+v  -16.4317 14.8799 16.4317
+v  -0.0000 18.3807 -15.0000
+v  -0.0000 12.8947 -25.9808
+v  -16.4317 14.8799 -16.4317
+v  16.4317 14.8799 -16.4317
+v  -0.0000 -158.7133 -0.0000
+v  15.0000 -156.7052 -0.0000
+v  -0.0000 -156.7052 15.0000
+v  16.4317 -153.2045 16.4317
+v  -0.0000 -151.2192 25.9808
+v  25.9808 -151.2192 -0.0000
+v  -15.0000 -156.7052 -0.0000
+v  -16.4317 -153.2045 16.4317
+v  -25.9808 -151.2192 -0.0000
+v  -0.0000 -156.7052 -15.0000
+v  -16.4317 -153.2045 -16.4317
+v  -0.0000 -151.2192 -25.9808
+v  16.4317 -153.2045 -16.4317
+# 50 vertices
+
+vn 1.0000 -0.0000 0.0000
+vn 0.8660 -0.0000 -0.5000
+vn 0.5000 0.0000 -0.8660
+vn -0.0000 0.0000 -1.0000
+vn 0.0000 0.0000 -1.0000
+vn -0.5000 0.0000 -0.8660
+vn -0.8660 0.0000 -0.5000
+vn -1.0000 0.0000 0.0000
+vn -0.8660 0.0000 0.5000
+vn -0.8660 -0.0000 0.5000
+vn -0.5000 -0.0000 0.8660
+vn -0.0000 -0.0000 1.0000
+vn 0.5000 -0.0000 0.8660
+vn 0.8660 -0.0000 0.5000
+vn 0.0000 1.0000 0.0000
+vn 0.0000 0.9552 0.2960
+vn 0.2960 0.9552 0.0000
+vn -0.0000 0.7017 0.7125
+vn 0.4315 0.7922 0.4315
+vn 0.7125 0.7017 0.0000
+vn -0.0000 0.4726 0.8813
+vn 0.4085 0.5791 0.7055
+vn 0.7055 0.5791 0.4085
+vn 0.8813 0.4726 0.0000
+vn -0.2960 0.9552 0.0000
+vn -0.7125 0.7017 0.0000
+vn -0.4315 0.7922 0.4315
+vn -0.8813 0.4726 -0.0000
+vn -0.7055 0.5791 0.4085
+vn -0.4085 0.5791 0.7055
+vn 0.0000 0.9552 -0.2960
+vn 0.0000 0.7017 -0.7125
+vn -0.4315 0.7922 -0.4315
+vn 0.0000 0.4726 -0.8813
+vn -0.4085 0.5791 -0.7055
+vn -0.7055 0.5791 -0.4085
+vn 0.4315 0.7922 -0.4315
+vn 0.7055 0.5791 -0.4085
+vn 0.4085 0.5791 -0.7055
+vn 0.0000 -1.0000 -0.0000
+vn 0.2960 -0.9552 -0.0000
+vn 0.0000 -0.9552 0.2960
+vn 0.4323 -0.7913 0.4323
+vn 0.0000 -0.7005 0.7136
+vn 0.7136 -0.7005 0.0000
+vn 0.4096 -0.5766 0.7070
+vn -0.0000 -0.4700 0.8827
+vn 0.7070 -0.5766 0.4096
+vn 0.8827 -0.4700 0.0000
+vn -0.2960 -0.9552 -0.0000
+vn -0.4323 -0.7913 0.4323
+vn -0.7136 -0.7005 0.0000
+vn -0.7070 -0.5766 0.4096
+vn -0.8827 -0.4700 -0.0000
+vn -0.4096 -0.5766 0.7070
+vn 0.0000 -0.9552 -0.2960
+vn -0.4323 -0.7913 -0.4323
+vn 0.0000 -0.7005 -0.7136
+vn -0.4096 -0.5766 -0.7070
+vn -0.0000 -0.4700 -0.8827
+vn -0.7070 -0.5766 -0.4096
+vn 0.4323 -0.7913 -0.4323
+vn 0.7070 -0.5766 -0.4096
+vn 0.4096 -0.5766 -0.7070
+# 64 vertex normals
+
+vt 0.8333 0.0000 0.0000
+vt 0.7500 0.0000 0.0000
+vt 0.7500 1.0000 0.0000
+vt 0.8333 1.0000 0.0000
+vt 0.6667 0.0000 0.0000
+vt 0.6667 1.0000 0.0000
+vt 0.5833 0.0000 0.0000
+vt 0.5833 1.0000 0.0000
+vt 0.5000 0.0000 0.0000
+vt 0.5000 1.0000 0.0000
+vt 0.4167 0.0000 0.0000
+vt 0.4167 1.0000 0.0000
+vt 0.3333 0.0000 0.0000
+vt 0.3333 1.0000 0.0000
+vt 0.2500 0.0000 -0.0000
+vt 0.2500 1.0000 -0.0000
+vt 0.1667 0.0000 0.0000
+vt 0.1667 1.0000 0.0000
+vt 0.0833 0.0000 0.0000
+vt 0.0833 1.0000 0.0000
+vt 0.0000 0.0000 0.0000
+vt 0.0000 1.0000 0.0000
+vt 1.0000 0.0000 0.0000
+vt 0.9167 0.0000 0.0000
+vt 0.9167 1.0000 0.0000
+vt 1.0000 1.0000 0.0000
+vt 0.5000 0.5000 0.0000
+vt 0.3414 0.3414 0.0000
+vt 0.6586 0.3414 0.0000
+vt 0.2098 0.2098 0.0000
+vt 0.5000 0.1534 0.0000
+vt 0.7902 0.2098 0.0000
+vt 0.1506 0.0915 0.0000
+vt 0.3735 -0.0000 0.0000
+vt 0.6265 -0.0000 0.0000
+vt 0.8494 0.0915 0.0000
+vt 0.3414 0.6586 0.0000
+vt 0.2098 0.7902 0.0000
+vt 0.1534 0.5000 0.0000
+vt 0.0915 0.8494 0.0000
+vt 0.0000 0.6265 0.0000
+vt 0.0000 0.3735 0.0000
+vt 0.0915 0.1506 0.0000
+vt 0.6586 0.6586 0.0000
+vt 0.7902 0.7902 0.0000
+vt 0.5000 0.8466 0.0000
+vt 0.8494 0.9085 0.0000
+vt 0.6265 1.0000 0.0000
+vt 0.3735 1.0000 0.0000
+vt 0.1506 0.9085 0.0000
+vt 0.8466 0.5000 0.0000
+vt 0.9085 0.1506 0.0000
+vt 1.0000 0.3735 0.0000
+vt 1.0000 0.6265 0.0000
+vt 0.9085 0.8494 0.0000
+vt 0.3416 0.3416 0.0000
+vt 0.6584 0.3416 0.0000
+vt 0.5000 0.1538 0.0000
+vt 0.7898 0.2102 0.0000
+vt 0.2102 0.2102 0.0000
+vt 0.6264 0.0000 0.0000
+vt 0.8492 0.0912 0.0000
+vt 0.3736 0.0000 0.0000
+vt 0.1508 0.0912 0.0000
+vt 0.6584 0.6584 0.0000
+vt 0.8462 0.5000 0.0000
+vt 0.7898 0.7898 0.0000
+vt 1.0000 0.6264 0.0000
+vt 0.9088 0.8492 0.0000
+vt 1.0000 0.3736 0.0000
+vt 0.9088 0.1508 0.0000
+vt 0.3416 0.6584 0.0000
+vt 0.5000 0.8462 0.0000
+vt 0.2102 0.7898 0.0000
+vt 0.3736 1.0000 0.0000
+vt 0.1508 0.9088 0.0000
+vt 0.6264 1.0000 0.0000
+vt 0.8492 0.9088 0.0000
+vt 0.1538 0.5000 0.0000
+vt 0.0000 0.3736 0.0000
+vt 0.0912 0.1508 0.0000
+vt 0.0000 0.6264 0.0000
+vt 0.0912 0.8492 0.0000
+# 83 texture coords
+
+g Object001
+usemtl models/cargo/medicines/side
+f 1/1/1 2/2/2 3/3/2 
+f 3/3/2 4/4/1 1/1/1 
+f 2/2/2 5/5/3 6/6/3 
+f 6/6/3 3/3/2 2/2/2 
+f 5/5/3 7/7/4 8/8/5 
+f 8/8/5 6/6/3 5/5/3 
+f 7/7/4 9/9/6 10/10/6 
+f 10/10/6 8/8/5 7/7/4 
+f 9/9/6 11/11/7 12/12/7 
+f 12/12/7 10/10/6 9/9/6 
+f 11/11/7 13/13/8 14/14/8 
+f 14/14/8 12/12/7 11/11/7 
+f 13/13/8 15/15/9 16/16/10 
+f 16/16/10 14/14/8 13/13/8 
+f 15/15/9 17/17/11 18/18/11 
+f 18/18/11 16/16/10 15/15/9 
+f 17/17/11 19/19/12 20/20/12 
+f 20/20/12 18/18/11 17/17/11 
+f 19/19/12 21/21/13 22/22/13 
+f 22/22/13 20/20/12 19/19/12 
+f 21/23/13 23/24/14 24/25/14 
+f 24/25/14 22/26/13 21/23/13 
+f 23/24/14 1/1/1 4/4/1 
+f 4/4/1 24/25/14 23/24/14 
+usemtl models/cargo/medicines/end
+f 25/27/15 26/28/16 27/29/17 
+f 26/28/16 28/30/18 29/31/19 
+f 26/28/16 29/31/19 27/29/17 
+f 27/29/17 29/31/19 30/32/20 
+f 28/30/18 20/33/21 22/34/22 
+f 28/30/18 22/34/22 29/31/19 
+f 29/31/19 22/34/22 24/35/23 
+f 29/31/19 24/35/23 30/32/20 
+f 30/32/20 24/35/23 4/36/24 
+f 25/27/15 31/37/25 26/28/16 
+f 31/37/25 32/38/26 33/39/27 
+f 31/37/25 33/39/27 26/28/16 
+f 26/28/16 33/39/27 28/30/18 
+f 32/38/26 14/40/28 16/41/29 
+f 32/38/26 16/41/29 33/39/27 
+f 33/39/27 16/41/29 18/42/30 
+f 33/39/27 18/42/30 28/30/18 
+f 28/30/18 18/42/30 20/43/21 
+f 25/27/15 34/44/31 31/37/25 
+f 34/44/31 35/45/32 36/46/33 
+f 34/44/31 36/46/33 31/37/25 
+f 31/37/25 36/46/33 32/38/26 
+f 35/45/32 8/47/34 10/48/35 
+f 35/45/32 10/48/35 36/46/33 
+f 36/46/33 10/48/35 12/49/36 
+f 36/46/33 12/49/36 32/38/26 
+f 32/38/26 12/49/36 14/50/28 
+f 25/27/15 27/29/17 34/44/31 
+f 27/29/17 30/32/20 37/51/37 
+f 27/29/17 37/51/37 34/44/31 
+f 34/44/31 37/51/37 35/45/32 
+f 30/32/20 4/52/24 3/53/38 
+f 30/32/20 3/53/38 37/51/37 
+f 37/51/37 3/53/38 6/54/39 
+f 37/51/37 6/54/39 35/45/32 
+f 35/45/32 6/54/39 8/55/34 
+f 38/27/40 39/56/41 40/57/42 
+f 40/57/42 41/58/43 42/59/44 
+f 40/57/42 39/56/41 41/58/43 
+f 39/56/41 43/60/45 41/58/43 
+f 42/59/44 21/61/46 19/62/47 
+f 42/59/44 41/58/43 21/61/46 
+f 41/58/43 23/63/48 21/61/46 
+f 41/58/43 43/60/45 23/63/48 
+f 43/60/45 1/64/49 23/63/48 
+f 38/27/40 40/57/42 44/65/50 
+f 44/65/50 45/66/51 46/67/52 
+f 44/65/50 40/57/42 45/66/51 
+f 40/57/42 42/59/44 45/66/51 
+f 46/67/52 15/68/53 13/69/54 
+f 46/67/52 45/66/51 15/68/53 
+f 45/66/51 17/70/55 15/68/53 
+f 45/66/51 42/59/44 17/70/55 
+f 42/59/44 19/71/47 17/70/55 
+f 38/27/40 44/65/50 47/72/56 
+f 47/72/56 48/73/57 49/74/58 
+f 47/72/56 44/65/50 48/73/57 
+f 44/65/50 46/67/52 48/73/57 
+f 49/74/58 9/75/59 7/76/60 
+f 49/74/58 48/73/57 9/75/59 
+f 48/73/57 11/77/61 9/75/59 
+f 48/73/57 46/67/52 11/77/61 
+f 46/67/52 13/78/54 11/77/61 
+f 38/27/40 47/72/56 39/56/41 
+f 39/56/41 50/79/62 43/60/45 
+f 39/56/41 47/72/56 50/79/62 
+f 47/72/56 49/74/58 50/79/62 
+f 43/60/45 2/80/63 1/81/49 
+f 43/60/45 50/79/62 2/80/63 
+f 50/79/62 5/82/64 2/80/63 
+f 50/79/62 49/74/58 5/82/64 
+f 49/74/58 7/83/60 5/82/64 
+# 96 faces
+
diff --git a/base/models/cargo/medicines/side.jpg b/base/models/cargo/medicines/side.jpg
new file mode 100644
index 0000000..cbb4678
--- /dev/null
+++ b/base/models/cargo/medicines/side.jpg