From a5c90efefa24cd9e084f81a2fbf4d0d8b108ba29 Mon Sep 17 00:00:00 2001 From: kaetemi Date: Thu, 20 Feb 2014 00:16:37 +0100 Subject: [PATCH] Add shard sheets to build settings --- .../loot_table/loot_set/xmasgift_1.loot_set | 17 +++++ .../loot_table/xmasgift_1.loot_table | 16 +++++ .../sitem/xp_catalyser/ixpca01.sitem | 27 ++++++++ workspace/projects.py | 1 - .../shard/data_game_share/directories.py | 66 ------------------- workspace/shard/data_game_share/process.py | 44 ------------- workspace/shard/data_shard/directories.py | 7 ++ workspace/shard/data_shard/process.py | 7 +- 8 files changed, 71 insertions(+), 114 deletions(-) create mode 100644 leveldesign/game_element/loot_table/loot_set/xmasgift_1.loot_set create mode 100644 leveldesign/game_element/loot_table/xmasgift_1.loot_table create mode 100644 leveldesign/game_element/sitem/xp_catalyser/ixpca01.sitem delete mode 100644 workspace/shard/data_game_share/directories.py delete mode 100644 workspace/shard/data_game_share/process.py diff --git a/leveldesign/game_element/loot_table/loot_set/xmasgift_1.loot_set b/leveldesign/game_element/loot_table/loot_set/xmasgift_1.loot_set new file mode 100644 index 0000000..de6ca4f --- /dev/null +++ b/leveldesign/game_element/loot_table/loot_set/xmasgift_1.loot_set @@ -0,0 +1,17 @@ + +
+ + + + + + + + + + + + + + + diff --git a/leveldesign/game_element/loot_table/xmasgift_1.loot_table b/leveldesign/game_element/loot_table/xmasgift_1.loot_table new file mode 100644 index 0000000..e58c84c --- /dev/null +++ b/leveldesign/game_element/loot_table/xmasgift_1.loot_table @@ -0,0 +1,16 @@ + +
+ + + + + + + + + + + + + + diff --git a/leveldesign/game_element/sitem/xp_catalyser/ixpca01.sitem b/leveldesign/game_element/sitem/xp_catalyser/ixpca01.sitem new file mode 100644 index 0000000..731b883 --- /dev/null +++ b/leveldesign/game_element/sitem/xp_catalyser/ixpca01.sitem @@ -0,0 +1,27 @@ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/workspace/projects.py b/workspace/projects.py index 963d68e..8710ab3 100644 --- a/workspace/projects.py +++ b/workspace/projects.py @@ -52,7 +52,6 @@ ProjectsToProcess += [ "common/cfg" ] # Shard specific ProjectsToProcess += [ "shard/data_shard" ] ProjectsToProcess += [ "shard/data_language" ] -ProjectsToProcess += [ "shard/data_game_share" ] # Ecosystem projects ProjectsToProcess += [ "ecosystems/desert" ] 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_shard/directories.py b/workspace/shard/data_shard/directories.py index 5a43b42..066c163 100644 --- a/workspace/shard/data_shard/directories.py +++ b/workspace/shard/data_shard/directories.py @@ -40,6 +40,9 @@ CopyDirectSourceDirectories += [ DataShardDirectory ] CopyDirectSourceDirectories += [ LeveldesignDataShardDirectory ] CopyDirectSourceFiles = [ ] +# Sheets shard directories +VisualSlotTabBuildDirectory = "common/leveldesign/visual_slot_tab" + # *** SOURCE DIRECTORIES IN LEVELDESIGN *** CopyLeveldesignSourceDirectories = [ ] @@ -56,8 +59,12 @@ CopyLeveldesignDfnSourceFiles = [ ] CopyDatabaseSourceDirectories = [ ] CopyDatabaseSourceFiles = [ ] +# Sheets shard directories +SheetsShardBuildDirectory = CommonPath + "/sheets_shard" + # *** INSTALL DIRECTORIES IN THE CLIENT DATA *** # Common data install directory CopyInstallDirectory = CommonName +SheetsShardInstallDirectory = CommonName diff --git a/workspace/shard/data_shard/process.py b/workspace/shard/data_shard/process.py index ac4053c..4b1affd 100644 --- a/workspace/shard/data_shard/process.py +++ b/workspace/shard/data_shard/process.py @@ -29,6 +29,7 @@ # *** PROCESS CONFIG *** ProcessToComplete = [ ] ProcessToComplete += [ "copy" ] +ProcessToComplete += [ "sheets_shard" ] # *** COMMON NAMES AND PATHS *** @@ -36,9 +37,9 @@ CommonName = "data_shard" CommonPath = "shard/" + CommonName -# *** PACS PRIM LIST OPTIONS *** - - # *** COPY DIR OPTIONS *** +# *** SHEETS SHARD OPTIONS *** + +