1 files changed, 94 insertions, 97 deletions

diff --git a/games/planeshift/pkg-plist b/games/planeshift/pkg-plist
index 390523b4e1ee..75f8b09456a6 100644
--- a/games/planeshift/pkg-plist
+++ b/games/planeshift/pkg-plist
@@ -1,92 +1,14 @@
 bin/planeshift
-bin/updater
-bin/pssetup
 %%MYSQL%%bin/psserver
-%%EXAMPLE%%share/examples/planeshift/accessrules.sql
-%%EXAMPLE%%share/examples/planeshift/accounts.sql
-%%EXAMPLE%%share/examples/planeshift/action_locations.sql
-%%EXAMPLE%%share/examples/planeshift/alliances.sql
-%%EXAMPLE%%share/examples/planeshift/armorvsweapon.sql
-%%EXAMPLE%%share/examples/planeshift/bad_names.sql
-%%EXAMPLE%%share/examples/planeshift/bans.sql
-%%EXAMPLE%%share/examples/planeshift/buddy_list.sql
-%%EXAMPLE%%share/examples/planeshift/command_access.sql
-%%EXAMPLE%%share/examples/planeshift/commonstrings.sql
-%%EXAMPLE%%share/examples/planeshift/create_all.sql
-%%EXAMPLE%%share/examples/planeshift/char_adv.sql
-%%EXAMPLE%%share/examples/planeshift/char_creation.sql
-%%EXAMPLE%%share/examples/planeshift/char_skills.sql
-%%EXAMPLE%%share/examples/planeshift/char_traits.sql
-%%EXAMPLE%%share/examples/planeshift/character_marriage_details.sql
-%%EXAMPLE%%share/examples/planeshift/character_quests.sql
-%%EXAMPLE%%share/examples/planeshift/characters.sql
-%%EXAMPLE%%share/examples/planeshift/deletechar.sql
-%%EXAMPLE%%share/examples/planeshift/deletenpc.sql
-%%EXAMPLE%%share/examples/planeshift/deletenpc_mb.sql
-%%EXAMPLE%%share/examples/planeshift/drop.sql
-%%EXAMPLE%%share/examples/planeshift/factions.sql
-%%EXAMPLE%%share/examples/planeshift/gm_command_log.sql
-%%EXAMPLE%%share/examples/planeshift/guildlevels.sql
-%%EXAMPLE%%share/examples/planeshift/guilds.sql
-%%EXAMPLE%%share/examples/planeshift/hunt_locations.sql
-%%EXAMPLE%%share/examples/planeshift/item_animations.sql
-%%EXAMPLE%%share/examples/planeshift/item_categories.sql
-%%EXAMPLE%%share/examples/planeshift/item_instances.sql
-%%EXAMPLE%%share/examples/planeshift/item_stats.sql
-%%EXAMPLE%%share/examples/planeshift/loot_modifiers.sql
-%%EXAMPLE%%share/examples/planeshift/loot_rule_details.sql
-%%EXAMPLE%%share/examples/planeshift/loot_rules.sql
-%%EXAMPLE%%share/examples/planeshift/merchant_item_cats.sql
-%%EXAMPLE%%share/examples/planeshift/migration.sql
-%%EXAMPLE%%share/examples/planeshift/movement_base.sql
-%%EXAMPLE%%share/examples/planeshift/movement_extras.sql
-%%EXAMPLE%%share/examples/planeshift/movement_require.sql
-%%EXAMPLE%%share/examples/planeshift/movement_variant.sql
-%%EXAMPLE%%share/examples/planeshift/natural_resources.sql
-%%EXAMPLE%%share/examples/planeshift/npc_bad_text.sql
-%%EXAMPLE%%share/examples/planeshift/npc_disallowed_words.sql
-%%EXAMPLE%%share/examples/planeshift/npc_kas.sql
-%%EXAMPLE%%share/examples/planeshift/npc_responses.sql
-%%EXAMPLE%%share/examples/planeshift/npc_spawn_ranges.sql
-%%EXAMPLE%%share/examples/planeshift/npc_spawn_rules.sql
-%%EXAMPLE%%share/examples/planeshift/npc_synonyms.sql
-%%EXAMPLE%%share/examples/planeshift/npc_trigger_groups.sql
-%%EXAMPLE%%share/examples/planeshift/npc_triggers.sql
-%%EXAMPLE%%share/examples/planeshift/petitions.sql
-%%EXAMPLE%%share/examples/planeshift/player_spells.sql
-%%EXAMPLE%%share/examples/planeshift/progress_events.sql
-%%EXAMPLE%%share/examples/planeshift/quest_scripts.sql
-%%EXAMPLE%%share/examples/planeshift/quests.sql
-%%EXAMPLE%%share/examples/planeshift/race_info.sql
-%%EXAMPLE%%share/examples/planeshift/sc_npc_definitions.sql
-%%EXAMPLE%%share/examples/planeshift/sectors.sql
-%%EXAMPLE%%share/examples/planeshift/security_levels.sql
-%%EXAMPLE%%share/examples/planeshift/server_options.sql
-%%EXAMPLE%%share/examples/planeshift/skills.sql
-%%EXAMPLE%%share/examples/planeshift/spell_glyphs.sql
-%%EXAMPLE%%share/examples/planeshift/spells.sql
-%%EXAMPLE%%share/examples/planeshift/sys_modules.sql
-%%EXAMPLE%%share/examples/planeshift/sys_privileges.sql
-%%EXAMPLE%%share/examples/planeshift/sys_privileges_list.sql
-%%EXAMPLE%%share/examples/planeshift/sys_programs.sql
-%%EXAMPLE%%share/examples/planeshift/tips.sql
-%%EXAMPLE%%share/examples/planeshift/trade_autocontainers.sql
-%%EXAMPLE%%share/examples/planeshift/trade_combinations.sql
-%%EXAMPLE%%share/examples/planeshift/trade_constraints.sql
-%%EXAMPLE%%share/examples/planeshift/trade_patterns.sql
-%%EXAMPLE%%share/examples/planeshift/trade_transformations.sql
-%%EXAMPLE%%share/examples/planeshift/trainer_skills.sql
-%%EXAMPLE%%share/examples/planeshift/traits.sql
-%%EXAMPLE%%share/examples/planeshift/upgrade_schema.sql
-%%EXAMPLE%%share/examples/planeshift/ways.sql
+bin/pssetup
+bin/updater
 %%PLANEDIR%%/art/README
 %%PLANEDIR%%/art/apps.zip
+%%PLANEDIR%%/art/characters.zip
 %%PLANEDIR%%/art/eedit.zip
-%%PLANEDIR%%/art/effects/marker01.png
-%%PLANEDIR%%/art/effects/raindrop.png
-%%PLANEDIR%%/art/effects/snow.jpg
-%%PLANEDIR%%/art/fakemodels.zip
-%%PLANEDIR%%/art/models.zip
+%%PLANEDIR%%/art/effects/marker01.dds
+%%PLANEDIR%%/art/effects/raindrop.dds
+%%PLANEDIR%%/art/effects/snow.dds
 %%PLANEDIR%%/art/music/ComplexWind3.ogg
 %%PLANEDIR%%/art/music/README
 %%PLANEDIR%%/art/music/effects/PS_Thunder1.wav
@@ -117,19 +39,20 @@ bin/pssetup
 %%PLANEDIR%%/art/music/gui/menu/btndown.wav
 %%PLANEDIR%%/art/music/gui/menu/btquit.wav
 %%PLANEDIR%%/art/music/torch_test.wav
+%%PLANEDIR%%/art/npcs.zip
 %%PLANEDIR%%/art/pawseditor.zip
 %%PLANEDIR%%/art/psclient-setup.zip
 %%PLANEDIR%%/art/racelib.xml
 %%PLANEDIR%%/art/runes/README
-%%PLANEDIR%%/art/runes/azure/air.bmp
-%%PLANEDIR%%/art/runes/azure/bond.bmp
-%%PLANEDIR%%/art/runes/azure/dome.bmp
-%%PLANEDIR%%/art/runes/azure/fly.bmp
-%%PLANEDIR%%/art/runes/azure/gas.bmp
-%%PLANEDIR%%/art/runes/azure/humanoid.bmp
-%%PLANEDIR%%/art/runes/azure/mind.bmp
-%%PLANEDIR%%/art/runes/azure/sleep.bmp
-%%PLANEDIR%%/art/runes/azure/sound.bmp
+%%PLANEDIR%%/art/runes/azure/air.dds
+%%PLANEDIR%%/art/runes/azure/bond.dds
+%%PLANEDIR%%/art/runes/azure/dome.dds
+%%PLANEDIR%%/art/runes/azure/fly.dds
+%%PLANEDIR%%/art/runes/azure/gas.dds
+%%PLANEDIR%%/art/runes/azure/humanoid.dds
+%%PLANEDIR%%/art/runes/azure/mind.dds
+%%PLANEDIR%%/art/runes/azure/sleep.dds
+%%PLANEDIR%%/art/runes/azure/sound.dds
 %%PLANEDIR%%/art/sfxfiles.dtd
 %%PLANEDIR%%/art/shaders/colorize.xml
 %%PLANEDIR%%/art/shaders/particle_basic.xml
@@ -145,7 +68,6 @@ bin/pssetup
 %%PLANEDIR%%/art/things/items.zip
 %%PLANEDIR%%/art/things/potions.zip
 %%PLANEDIR%%/art/things/weapons.zip
-%%PLANEDIR%%/art/world/.cvsignore
 %%PLANEDIR%%/art/world/lighting.xml
 %%PLANEDIR%%/art/world/npcroom.zip
 %%PLANEDIR%%/art/world/podium.zip
@@ -223,6 +145,7 @@ bin/pssetup
 %%PLANEDIR%%/data/gui/guildwindow.xml
 %%PLANEDIR%%/data/gui/helpwindow.xml
 %%PLANEDIR%%/data/gui/ignorewindow.xml
+%%PLANEDIR%%/data/gui/illumination.xml
 %%PLANEDIR%%/data/gui/infowindow.xml
 %%PLANEDIR%%/data/gui/interact.xml
 %%PLANEDIR%%/data/gui/inventory.xml
@@ -253,6 +176,7 @@ bin/pssetup
 %%PLANEDIR%%/data/gui/splash.xml
 %%PLANEDIR%%/data/gui/styles.xml
 %%PLANEDIR%%/data/gui/summary.xml
+%%PLANEDIR%%/data/gui/tutorial.xml
 %%PLANEDIR%%/data/gui/widgetconfigwindow.xml
 %%PLANEDIR%%/data/gui/yesno.xml
 %%PLANEDIR%%/data/gui/zodiacs.xml
@@ -260,12 +184,11 @@ bin/pssetup
 %%PLANEDIR%%/data/help.xml
 %%PLANEDIR%%/data/npcbehave.xml
 %%PLANEDIR%%/data/npcdefs.xml
-%%PLANEDIR%%/data/options/.cvsignore
 %%PLANEDIR%%/data/options/camera_def.xml
+%%PLANEDIR%%/data/options/controls_def.xml
 %%PLANEDIR%%/data/options/chat_def.xml
 %%PLANEDIR%%/data/options/entityinter_def.xml
 %%PLANEDIR%%/data/options/entitylabels_def.xml
-%%PLANEDIR%%/data/options/keys_def.xml
 %%PLANEDIR%%/data/options/mouse_def.xml
 %%PLANEDIR%%/data/options/pvp_def.xml
 %%PLANEDIR%%/data/options/shortcutcommands_def.xml
@@ -311,6 +234,7 @@ bin/pssetup
 %%PLANEDIR%%/data/ttf/scurlock.ttf
 %%PLANEDIR%%/data/ttf/verdana.ttf
 %%PLANEDIR%%/data/updater/serverlist.xml
+%%PLANEDIR%%/data/updater/updateroptions.xml
 %%PLANEDIR%%/data/updater/updaterwindow.xml
 %%PLANEDIR%%/data/zoneinfo.xml
 %%MYSQL%%%%PLANEDIR%%/dbmysql.so
@@ -335,7 +259,79 @@ bin/pssetup
 %%PLANEDIR%%/updater
 %%PLANEDIR%%/updaterconfig.xml
 %%PLANEDIR%%/vfs.cfg
-%%EXAMPLE%%@dirrm share/examples/planeshift
+%%EXAMPLE%%share/examples/planeshift/accessrules.sql
+%%EXAMPLE%%share/examples/planeshift/accounts.sql
+%%EXAMPLE%%share/examples/planeshift/action_locations.sql
+%%EXAMPLE%%share/examples/planeshift/alliances.sql
+%%EXAMPLE%%share/examples/planeshift/armorvsweapon.sql
+%%EXAMPLE%%share/examples/planeshift/bad_names.sql
+%%EXAMPLE%%share/examples/planeshift/bans.sql
+%%EXAMPLE%%share/examples/planeshift/command_access.sql
+%%EXAMPLE%%share/examples/planeshift/commonstrings.sql
+%%EXAMPLE%%share/examples/planeshift/create_all.sql
+%%EXAMPLE%%share/examples/planeshift/char_adv.sql
+%%EXAMPLE%%share/examples/planeshift/char_create_affinity.sql
+%%EXAMPLE%%share/examples/planeshift/char_creation.sql
+%%EXAMPLE%%share/examples/planeshift/char_skills.sql
+%%EXAMPLE%%share/examples/planeshift/char_traits.sql
+%%EXAMPLE%%share/examples/planeshift/character_quests.sql
+%%EXAMPLE%%share/examples/planeshift/character_relationships.sql
+%%EXAMPLE%%share/examples/planeshift/characters.sql
+%%EXAMPLE%%share/examples/planeshift/deletechar.sql
+%%EXAMPLE%%share/examples/planeshift/deletenpc.sql
+%%EXAMPLE%%share/examples/planeshift/deletenpc_mb.sql
+%%EXAMPLE%%share/examples/planeshift/drop.sql
+%%EXAMPLE%%share/examples/planeshift/factions.sql
+%%EXAMPLE%%share/examples/planeshift/familiar_types.sql
+%%EXAMPLE%%share/examples/planeshift/gm_command_log.sql
+%%EXAMPLE%%share/examples/planeshift/guildlevels.sql
+%%EXAMPLE%%share/examples/planeshift/guilds.sql
+%%EXAMPLE%%share/examples/planeshift/hunt_locations.sql
+%%EXAMPLE%%share/examples/planeshift/item_animations.sql
+%%EXAMPLE%%share/examples/planeshift/item_categories.sql
+%%EXAMPLE%%share/examples/planeshift/item_instances.sql
+%%EXAMPLE%%share/examples/planeshift/item_stats.sql
+%%EXAMPLE%%share/examples/planeshift/loot_modifiers.sql
+%%EXAMPLE%%share/examples/planeshift/loot_rule_details.sql
+%%EXAMPLE%%share/examples/planeshift/loot_rules.sql
+%%EXAMPLE%%share/examples/planeshift/merchant_item_cats.sql
+%%EXAMPLE%%share/examples/planeshift/migration.sql
+%%EXAMPLE%%share/examples/planeshift/movement.sql
+%%EXAMPLE%%share/examples/planeshift/natural_resources.sql
+%%EXAMPLE%%share/examples/planeshift/npc_bad_text.sql
+%%EXAMPLE%%share/examples/planeshift/npc_disallowed_words.sql
+%%EXAMPLE%%share/examples/planeshift/npc_kas.sql
+%%EXAMPLE%%share/examples/planeshift/npc_responses.sql
+%%EXAMPLE%%share/examples/planeshift/npc_spawn_ranges.sql
+%%EXAMPLE%%share/examples/planeshift/npc_spawn_rules.sql
+%%EXAMPLE%%share/examples/planeshift/npc_synonyms.sql
+%%EXAMPLE%%share/examples/planeshift/npc_trigger_groups.sql
+%%EXAMPLE%%share/examples/planeshift/npc_triggers.sql
+%%EXAMPLE%%share/examples/planeshift/petitions.sql
+%%EXAMPLE%%share/examples/planeshift/player_spells.sql
+%%EXAMPLE%%share/examples/planeshift/progress_events.sql
+%%EXAMPLE%%share/examples/planeshift/quest_scripts.sql
+%%EXAMPLE%%share/examples/planeshift/quests.sql
+%%EXAMPLE%%share/examples/planeshift/race_info.sql
+%%EXAMPLE%%share/examples/planeshift/sc_npc_definitions.sql
+%%EXAMPLE%%share/examples/planeshift/sectors.sql
+%%EXAMPLE%%share/examples/planeshift/security_levels.sql
+%%EXAMPLE%%share/examples/planeshift/server_options.sql
+%%EXAMPLE%%share/examples/planeshift/skills.sql
+%%EXAMPLE%%share/examples/planeshift/spell_glyphs.sql
+%%EXAMPLE%%share/examples/planeshift/spells.sql
+%%EXAMPLE%%share/examples/planeshift/tips.sql
+%%EXAMPLE%%share/examples/planeshift/trade_autocontainers.sql
+%%EXAMPLE%%share/examples/planeshift/trade_combinations.sql
+%%EXAMPLE%%share/examples/planeshift/trade_constraints.sql
+%%EXAMPLE%%share/examples/planeshift/trade_patterns.sql
+%%EXAMPLE%%share/examples/planeshift/trade_transformations.sql
+%%EXAMPLE%%share/examples/planeshift/trainer_skills.sql
+%%EXAMPLE%%share/examples/planeshift/traits.sql
+%%EXAMPLE%%share/examples/planeshift/tribe_members.sql
+%%EXAMPLE%%share/examples/planeshift/tribes.sql
+%%EXAMPLE%%share/examples/planeshift/upgrade_schema.sql
+%%EXAMPLE%%share/examples/planeshift/ways.sql
 @dirrmtry %%PLANEDIR%%/art/effects
 @dirrmtry %%PLANEDIR%%/art/music/effects
 @dirrmtry %%PLANEDIR%%/art/music/gui/ccreate
@@ -367,3 +363,4 @@ bin/pssetup
 @dirrmtry %%PLANEDIR%%/data/updater
 @dirrmtry %%PLANEDIR%%/data
 @unexec rmdir %D/%%PLANEDIR%% >/dev/null 2>&1 || echo "Remove manually the extra files into data and art directories (200M aprox.). Also you could move data and art directory to some backup directory."
+%%EXAMPLE%%@dirrm share/examples/planeshift