10 files changed, 129 insertions, 217 deletions
diff --git a/base/ini/game.ini b/base/ini/game.ini
index 6af5477..b8d61b7 100644
--- a/base/ini/game.ini
+++ b/base/ini/game.ini
@@ -1,8 +1,11 @@
 ;
 ; game.ini
 ; game settings
+;
 
 ; default settings for new players
+;
+
 [player]
 ; zone a new player will start in
 zone=ghant
@@ -11,3 +14,9 @@ ship=vector
 ; amount of credits a new player receives
 credits=5000
 
+; default cargo pod settings
+;
+
+[cargo]
+model=maps/cargo/pod
+
diff --git a/base/ini/menu.ini b/base/ini/menu.ini
deleted file mode 100644
index 221a0eb..0000000
--- a/base/ini/menu.ini
+++ /dev/null
@@ -1,125 +0,0 @@
-;
-; menu.ini
-; client menu definitions
-;
-
-;
-; main menu
-; ------------------------------------------------------------------
-
-[menu]
-label=main
-; background bitmap
-background=bitmaps/banner
-
-[label]
-text=Main Menu
-
-[button]
-text=New Game
-command=connect
-
-[button]
-text=Internet
-command=connect tremulous.soliter.org
-
-[button]
-text=Options
-command=menu options
-
-[button]
-text=Quit
-command=quit
-
-;
-; options menu
-; ------------------------------------------------------------------
-
-[menu]
-label=options
-background=bitmaps/banner
-
-[label]
-text=Options
-
-[button]
-text=Toggle fullscreen
-command=toggle r_fullscreen
-align=left
-
-[button]
-text=Toggle grid
-command=toggle r_grid
-align=left
-
-[button]
-text=Toggle keypress
-command=toggle draw_keypress
-align=left
-
-[button]
-text=Toggle stats
-command=toggle draw_stats
-align=left
-
-[button]
-text=Toggle wireframe
-command=toggle r_wireframe
-align=left
-
-[button]
-text=Return
-command=menu previous
-align=center
-
-;
-; game menu
-; ------------------------------------------------------------------
-
-[menu] 
-label=game
-background=bitmaps/banner
-
-[label]
-text=Main Menu
-
-[button]
-text=Options
-command=menu options
-
-[button]
-text=Disconnect
-command=disconnect
-
-[button]
-text=Quit
-command=quit
-
-[button]
-text=Return
-command=menu hide
-
-;
-; join menu
-; ------------------------------------------------------------------
-
-[menu]
-label=join
-background=bitmaps/banner
-
-[label]
-text=Project::OSiRiON
-
-[button]
-text=Join
-; note: we use comma as command seperator in .ini files.
-command=join, menu hide
-
-[button]
-text=Disconnect
-command=disconnect
-
-[button]
-text=Main menu
-command=menu game
-
diff --git a/base/ini/particles/dust_trail.ini b/base/ini/particles/dust_trail.ini
deleted file mode 100644
index f135327..0000000
--- a/base/ini/particles/dust_trail.ini
+++ /dev/null
@@ -1,13 +0,0 @@
-;
-; particles/dust_trail.ini
-; wing tip trail particles
-;
-
-[particles]
-type=trail
-texture=fx/engine_trail
-timeout=4.0
-eject=0.15
-radius=6
-alpha=0.5
-
diff --git a/base/ini/particles/engine_exhaust.ini b/base/ini/particles/engine_exhaust.ini
deleted file mode 100644
index 0c71d3d..0000000
--- a/base/ini/particles/engine_exhaust.ini
+++ /dev/null
@@ -1,14 +0,0 @@
-;
-; particles/engine_exhaust.ini
-; default engine exhaust particles
-;
-
-[particles]
-type=flame
-texture=fx/flame00
-timeout=0.12
-eject=0.02
-radius=18
-alpha=0.5
-offset=0.25 
-
diff --git a/base/ini/particles/engine_exhaust_tsukhan.ini b/base/ini/particles/engine_exhaust_tsukhan.ini
deleted file mode 100644
index 86d375d..0000000
--- a/base/ini/particles/engine_exhaust_tsukhan.ini
+++ /dev/null
@@ -1,13 +0,0 @@
-;
-; particles/engine_exhaust_tsukhan.ini
-; tsukhan engine exhaust particles
-;
-
-[particles]
-type=flame
-texture=fx/flame_tsukhan
-timeout=1.0
-eject=0.01
-radius=32
-alpha=0.5
-
diff --git a/base/ini/particles/engine_smoke.ini b/base/ini/particles/engine_smoke.ini
deleted file mode 100644
index df7ed2b..0000000
--- a/base/ini/particles/engine_smoke.ini
+++ /dev/null
@@ -1,13 +0,0 @@
-;
-; particles/engine_smoke_tsukhan.ini
-; tsukhan engine smoke particles
-;
-
-[particles]
-type=jet
-texture=fx/engine_smoke
-timeout=3.0
-eject=0.1
-radius=64
-alpha=0.8
-
diff --git a/base/ini/particles/engine_smoke_tsukhan.ini b/base/ini/particles/engine_smoke_tsukhan.ini
deleted file mode 100644
index 31e1000..0000000
--- a/base/ini/particles/engine_smoke_tsukhan.ini
+++ /dev/null
@@ -1,13 +0,0 @@
-;
-; particles/engine_smoke_tsukhan.ini
-; tsukhan engine smoke particles
-;
-
-[particles]
-type=jet
-texture=fx/engine_smoke_tsukhan
-timeout=1.5
-eject=0.1
-radius=64
-alpha=0.8
-
diff --git a/base/ini/particles/engine_trail.ini b/base/ini/particles/engine_trail.ini
deleted file mode 100644
index b97a93a..0000000
--- a/base/ini/particles/engine_trail.ini
+++ /dev/null
@@ -1,13 +0,0 @@
-;
-; particles/engine_trail.ini
-; default engine trail particles
-;
-
-[particles]
-type=trail
-texture=fx/engine_trail
-timeout=4.0
-eject=0.15
-radius=12
-alpha=0.5
-
diff --git a/base/ini/particles/engine_trail_tsukhan.ini b/base/ini/particles/engine_trail_tsukhan.ini
deleted file mode 100644
index 3adfadf..0000000
--- a/base/ini/particles/engine_trail_tsukhan.ini
+++ /dev/null
@@ -1,13 +0,0 @@
-;
-; particles/engine_trail_tsukhan.ini
-; tsukhan engine trail particles
-;
-
-[particles]
-type=trail
-texture=fx/engine_trail_tsukhan
-timeout=4.0
-eject=0.15
-radius=12
-alpha=1.0
-
diff --git a/base/ini/ui.ini b/base/ini/ui.ini
index 404dc1a..43df516 100644
--- a/base/ini/ui.ini
+++ b/base/ini/ui.ini
@@ -45,3 +45,123 @@ warning=1 1 0
 ; error text color
 error=1 0 0
 
+;
+; main menu
+; ------------------------------------------------------------------
+
+[menu]
+label=main
+; background bitmap
+background=bitmaps/banner
+
+[label]
+text=Main Menu
+
+[button]
+text=New Game
+command=connect
+
+[button]
+text=Internet
+command=connect tremulous.soliter.org
+
+[button]
+text=Options
+command=menu options
+
+[button]
+text=Quit
+command=quit
+
+;
+; options menu
+; ------------------------------------------------------------------
+
+[menu]
+label=options
+background=bitmaps/banner
+
+[label]
+text=Options
+
+[button]
+text=Toggle fullscreen
+command=toggle r_fullscreen
+align=left
+
+[button]
+text=Toggle grid
+command=toggle r_grid
+align=left
+
+[button]
+text=Toggle keypress
+command=toggle draw_keypress
+align=left
+
+[button]
+text=Toggle stats
+command=toggle draw_stats
+align=left
+
+[button]
+text=Toggle wireframe
+command=toggle r_wireframe
+align=left
+
+[button]
+text=Return
+command=menu previous
+align=center
+
+;
+; game menu
+; ------------------------------------------------------------------
+
+[menu] 
+label=game
+background=bitmaps/banner
+
+[label]
+text=Main Menu
+
+[button]
+text=Options
+command=menu options
+
+[button]
+text=Disconnect
+command=disconnect
+
+[button]
+text=Quit
+command=quit
+
+[button]
+text=Return
+command=menu hide
+
+;
+; join menu
+; ------------------------------------------------------------------
+
+[menu]
+label=join
+background=bitmaps/banner
+
+[label]
+text=Project::OSiRiON
+
+[button]
+text=Join
+; note: we use comma as command seperator in .ini files.
+command=join, menu hide
+
+[button]
+text=Disconnect
+command=disconnect
+
+[button]
+text=Main menu
+command=menu game
+