From c12c8176a14048f9a6b182202b400052f5d84522 Mon Sep 17 00:00:00 2001 From: kaetemi Date: Thu, 20 Feb 2014 22:39:44 +0100 Subject: [PATCH] Adjust sheets configuration --- workspace/projects.py | 7 +- .../shard/data_game_share/directories.py | 66 ------------------- workspace/shard/data_game_share/process.py | 44 ------------- .../shard/data_leveldesign/directories.py | 4 +- 4 files changed, 5 insertions(+), 116 deletions(-) delete mode 100644 workspace/shard/data_game_share/directories.py delete mode 100644 workspace/shard/data_game_share/process.py diff --git a/workspace/projects.py b/workspace/projects.py index c4ac9c8..b4b9f5b 100644 --- a/workspace/projects.py +++ b/workspace/projects.py @@ -57,7 +57,6 @@ ProjectsToProcess += [ "common/cfg" ] ProjectsToProcess += [ "shard/data_shard" ] ProjectsToProcess += [ "shard/data_language" ] ProjectsToProcess += [ "shard/data_leveldesign" ] -ProjectsToProcess += [ "shard/data_game_share" ] # Ecosystem projects ProjectsToProcess += [ "ecosystems/desert" ] @@ -75,7 +74,7 @@ ProjectsToProcess += [ "continents/indoors" ] # Note: must be after other contin InstallShardDataDirectories = [ ] -InstallShardDataDirectories += [ "data_game_share" ] +InstallShardDataDirectories += [ "data_mainland_common_primitives" ] InstallShardDataDirectories += [ "data_common" ] InstallShardDataDirectories += [ "data_language" ] InstallShardDataDirectories += [ "data_leveldesign" ] @@ -99,14 +98,14 @@ InstallShardDataMultiDirectories += [ [ "data_r2_roots", [ ] ] ] # TODO # [ [ "", [ "", "" ] ] ] target_dir under shard data, source_dir under primitives InstallShardDataPrimitivesDirectories = [ ] -InstallShardDataPrimitivesDirectories += [ [ "data_mainland_common_primitives", [ "" ] ] ] +InstallShardDataPrimitivesDirectories += [ [ "data_game_share", [ "" ] ] ] InstallShardDataPrimitivesDirectories += [ [ "data_newbieland_primitives", [ "newbieland" ] ] ] # [ [ "", [ "", "" ], [ "", "" ], [ "", "" ] ] ] psFileList = [ ] if os.path.isdir(InstallDirectory + "/data_shard"): psFileList = os.listdir(InstallDirectory + "/data_shard") -psDatasets = [ ] # [ "data_shard/datasets.packed_sheets" ] +psDatasets = [ "data_shard/datasets.packed_sheets" ] psIOS = [ "data_shard/ios_sheets.packed_sheets" ] psGPMS = [ "data_shard/gpms.packed_sheets" ] psContinents = [ "data_shard/continents.packed_sheets" ] diff --git a/workspace/shard/data_game_share/directories.py b/workspace/shard/data_game_share/directories.py deleted file mode 100644 index 4001699..0000000 --- a/workspace/shard/data_game_share/directories.py +++ /dev/null @@ -1,66 +0,0 @@ -#!/usr/bin/python -# -# \file directories.py -# \brief Directories configuration -# \date 2014-02-13 20:32GMT -# \author Jan Boon (Kaetemi) -# Python port of game data build pipeline. -# Directories configuration. -# -# NeL - MMORPG Framework -# Copyright (C) 2014 by authors -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . -# - -from buildsite import * -import os - -# *** COMMON NAMES AND PATHS *** -CommonName = "data_game_share" -CommonPath = "shard/" + CommonName - - -# *** DIRECT SOURCE DIRECTORIES *** - -# Copy dir directories -CopyDirectSourceDirectories = [ ] -CopyDirectSourceFiles = [ ] -fileList = os.listdir(DataShardDirectory + "/mirror_sheets") -for fileName in fileList: - if fileName != ".svn" and fileName != ".." and fileName != "." and fileName != "*.*": - if fileName.endswith(".dataset"): - CopyDirectSourceFiles += [ DataShardDirectory + "/mirror_sheets/" + fileName ] - - -# *** SOURCE DIRECTORIES IN LEVELDESIGN *** -CopyLeveldesignSourceDirectories = [ ] -CopyLeveldesignSourceFiles = [ ] -CopyLeveldesignWorldSourceDirectories = [ ] -CopyLeveldesignWorldSourceFiles = [ ] -CopyLeveldesignDfnSourceDirectories = [ ] -CopyLeveldesignDfnSourceFiles = [ ] - - -# *** SOURCE DIRECTORIES IN THE DATABASE *** - -# Copy dir directories -CopyDatabaseSourceDirectories = [ ] -CopyDatabaseSourceFiles = [ ] - - -# *** INSTALL DIRECTORIES IN THE CLIENT DATA *** - -# Common data install directory -CopyInstallDirectory = CommonName diff --git a/workspace/shard/data_game_share/process.py b/workspace/shard/data_game_share/process.py deleted file mode 100644 index cf707f0..0000000 --- a/workspace/shard/data_game_share/process.py +++ /dev/null @@ -1,44 +0,0 @@ -#!/usr/bin/python -# -# \file config.py -# \brief Process configuration -# \date 2014-02-13 20:32GMT -# \author Jan Boon (Kaetemi) -# Python port of game data build pipeline. -# Process configuration. -# -# NeL - MMORPG Framework -# Copyright (C) 2014 by authors -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . -# - -# *** PROCESS CONFIGURATION *** - -# *** PROCESS CONFIG *** -ProcessToComplete = [ ] -ProcessToComplete += [ "copy" ] - - -# *** COMMON NAMES AND PATHS *** -CommonName = "data_game_share" -CommonPath = "shard/" + CommonName - - -# *** PACS PRIM LIST OPTIONS *** - - -# *** COPY DIR OPTIONS *** - - diff --git a/workspace/shard/data_leveldesign/directories.py b/workspace/shard/data_leveldesign/directories.py index f8068f1..d0fd8b0 100644 --- a/workspace/shard/data_leveldesign/directories.py +++ b/workspace/shard/data_leveldesign/directories.py @@ -44,8 +44,8 @@ CopyLeveldesignSourceDirectories = [ "game_element/emotes" ] CopyLeveldesignSourceFiles = [ "game_elem/sheet_id.bin", "game_elem/localisation.localisation_table" ] CopyLeveldesignWorldSourceDirectories = [ "" ] CopyLeveldesignWorldSourceFiles = [ ] -CopyLeveldesignDfnSourceDirectories = [ "basics", "game_elem/_item", "world", "game_elem/_emote" ] -CopyLeveldesignDfnSourceFiles = [ "game_elem/light_cycle.dfn", "game_elem/_season_light_cycle.dfn", "game_elem/localisation_table.dfn", "game_elem/_localisation_table_line.dfn", "_light.dfn", "_rgba.dfn", "_vector.dfn", "game_elem/weather_function.dfn", "game_elem/weather_function_modifier.dfn", "game_elem/weather_function_params.dfn", "game_elem/weather_function_visual.dfn" ] +CopyLeveldesignDfnSourceDirectories = [ "basics", "game_elem/_emote", "world" ] +CopyLeveldesignDfnSourceFiles = [ "game_elem/localisation_table.dfn", "game_elem/_localisation_table_line.dfn", "game_elem/_item/item_shield_category.typ", "game_elem/_item/item_slot.typ", "game_elem/_item/item_mp_group.typ", "_light.dfn", "_rgba.dfn", "_vector.dfn", "game_elem/weather_function.dfn", "game_elem/weather_function_modifier.dfn", "game_elem/weather_function_params.dfn", "game_elem/weather_function_visual.dfn" ] # *** SOURCE DIRECTORIES IN THE DATABASE ***