From f70bdc4032e979c4423286ae69c2af0a53ce1190 Mon Sep 17 00:00:00 2001 From: Fabien_HENON Date: Sat, 26 May 2012 19:21:19 +0200 Subject: [PATCH] Changed: #1469 StringId conversion to SheetId for sounds V2 (DOES NOT COMPILE YET) --HG-- branch : gsoc2012-fabien --- code/nel/include/nel/sound/audio_mixer_user.h | 18 +- .../nel/sound/background_sound_manager.h | 4 +- code/nel/include/nel/sound/clustered_sound.h | 5 +- code/nel/include/nel/sound/sound.h | 4 +- code/nel/include/nel/sound/sound_bank.h | 4 +- code/nel/include/nel/sound/source_common.h | 2 +- code/nel/include/nel/sound/u_audio_mixer.h | 4 +- code/nel/samples/sound/sound_sources/main.cpp | 2 +- .../samples/sound/stream_file/stream_file.cpp | 2 +- .../stream_ogg_vorbis/stream_ogg_vorbis.cpp | 2 +- code/nel/src/sound/audio_mixer_user.cpp | 22 +- .../src/sound/background_sound_manager.cpp | 8 +- code/nel/src/sound/clustered_sound.cpp | 2 +- code/nel/src/sound/sound.cpp | 2 +- code/nel/src/sound/sound_bank.cpp | 4 +- code/nel/src/sound/source_common.cpp | 4 +- code/ryzom/client/src/client_cfg.cpp | 2 +- code/ryzom/client/src/commands.cpp | 4 +- code/ryzom/client/src/sound_manager.cpp | 12 +- code/ryzom/client/src/sound_manager.h | 7 +- .../newbieland/urban_newbieland.primitive | 642 +++++++++++++++++- code/ryzom/server/frontend_service.cfg | 2 +- code/ryzom/server/shard_start_cmake.bat | 2 +- 23 files changed, 686 insertions(+), 74 deletions(-) diff --git a/code/nel/include/nel/sound/audio_mixer_user.h b/code/nel/include/nel/sound/audio_mixer_user.h index 48f07d8e2..a68eae065 100644 --- a/code/nel/include/nel/sound/audio_mixer_user.h +++ b/code/nel/include/nel/sound/audio_mixer_user.h @@ -93,9 +93,9 @@ public: //@{ /// @name IStringMapperProvider implementation /// map a string - NLMISC::CSheetId map(const std::string &str) { return NLMISC::CSheetId(str);/*NLMISC::CStringMapper::map(str);*/} + NLMISC::TStringId map(const std::string &str) { return NLMISC::CStringMapper::map(str);} /// unmap a string - const std::string &unmap(const NLMISC::CSheetId &stringId) { return stringId.toString();/*NLMISC::CStringMapper::unmap(stringId);*/} + const std::string &unmap(const NLMISC::TStringId &stringId) { return NLMISC::CStringMapper::unmap(stringId);} //@} @@ -321,8 +321,8 @@ public: void incPlayingSourceMuted() { ++_PlayingSourcesMuted; }; void decPlayingSourceMuted() { --_PlayingSourcesMuted; }; - void setUserVar(NLMISC::CSheetId varName, float value); - float getUserVar(NLMISC::CSheetId varName); + void setUserVar(NLMISC::TStringId varName, float value); + float getUserVar(NLMISC::TStringId varName); // music virtual bool playMusic(const std::string &fileName, uint xFadeTime= 0, bool async= true, bool loop=true); @@ -352,7 +352,7 @@ public: /// Add a reverb environment. void addEnvironment(const std::string &name, const IReverbEffect::CEnvironment &environment); /// Set the current reverb environment. - void setEnvironment(NLMISC::CSheetId environmentName, float roomSize); + void setEnvironment(NLMISC::TStringId environmentName, float roomSize); /// Set the current reverb environment. inline void setEnvironment(const std::string &environmentName, float roomSize) { setEnvironment(NLMISC::CStringMapper::map(environmentName), roomSize); } /// Get a reverb environment @@ -410,8 +410,8 @@ public: /// Read all user controled var sheets void initUserVar(); - void addUserControledSource(CSourceCommon *source, NLMISC::CSheetId varName); - void removeUserControledSource(CSourceCommon *source, NLMISC::CSheetId varName); + void addUserControledSource(CSourceCommon *source, NLMISC::TStringId varName); + void removeUserControledSource(CSourceCommon *source, NLMISC::TStringId varName); virtual void startDriverBench(); @@ -441,7 +441,7 @@ private: struct CControledSources { /// The user var name - NLMISC::CSheetId Name; + NLMISC::TStringId Name; /// Witch parameter to control TControledParamId ParamId; /// The controled sounds names. @@ -473,7 +473,7 @@ protected: /// Fill a vector of position and mute flag for all playing sound source. virtual void getPlayingSoundsPos(bool virtualPos, std::vector > &pos); - typedef CHashMap TUserVarControlsContainer; + typedef CHashMap TUserVarControlsContainer; /// Container for all user controler and currently controled playing source TUserVarControlsContainer _UserVarControls; diff --git a/code/nel/include/nel/sound/background_sound_manager.h b/code/nel/include/nel/sound/background_sound_manager.h index d06533475..b1405634c 100644 --- a/code/nel/include/nel/sound/background_sound_manager.h +++ b/code/nel/include/nel/sound/background_sound_manager.h @@ -282,7 +282,7 @@ private: struct TFxZone { /// Name of the env fx - NLMISC::CSheetId FxName; + NLMISC::TStringId FxName; /// The vector of points compositing the primitive std::vector Points; /// The min vector of the bounding box @@ -295,7 +295,7 @@ private: /// Container for the fx primitive. std::vector _FxZones; /// Last setted env fx. Used when clustered sound is not active - NLMISC::CSheetId _LastEnv; + NLMISC::TStringId _LastEnv; //@} }; diff --git a/code/nel/include/nel/sound/clustered_sound.h b/code/nel/include/nel/sound/clustered_sound.h index f29a850d0..4de54a3b8 100644 --- a/code/nel/include/nel/sound/clustered_sound.h +++ b/code/nel/include/nel/sound/clustered_sound.h @@ -249,11 +249,12 @@ private: /// The segment of all the audio path. std::vector > _AudioPath; - typedef CHashMap TClusterSoundCont; + typedef CHashMap TClusterSoundCont; /// The current cluster playing source indexed with sound group id TClusterSoundCont _Sources; - typedef CHashMap TStringStringMap; + //typedef CHashMap TStringStringMap; + typedef CHashMap TStringStringMap; /// The sound_group to sound assoc TStringStringMap _SoundGroupToSound; }; diff --git a/code/nel/include/nel/sound/sound.h b/code/nel/include/nel/sound/sound.h index 04b89ee67..d50266e3f 100644 --- a/code/nel/include/nel/sound/sound.h +++ b/code/nel/include/nel/sound/sound.h @@ -118,7 +118,7 @@ public: virtual void serial(NLMISC::IStream &s); - NLMISC::CSheetId getUserVarControler() { return _UserVarControler; } + NLMISC::TStringId getUserVarControler() { return _UserVarControler; } bool operator<( const CSound& otherSound ) const { @@ -146,7 +146,7 @@ protected: // Sound name. NLMISC::CSheetId _Name; /// An optional user var controler. - NLMISC::CSheetId _UserVarControler; + NLMISC::TStringId _UserVarControler; /// The group controller, always exists, owned by the audio mixer CGroupController *_GroupController; diff --git a/code/nel/include/nel/sound/sound_bank.h b/code/nel/include/nel/sound/sound_bank.h index 2d72f9935..d7cdf90d0 100644 --- a/code/nel/include/nel/sound/sound_bank.h +++ b/code/nel/include/nel/sound/sound_bank.h @@ -86,10 +86,10 @@ private: typedef CHashSet > TSimpleSoundContainer; // typedef std::hash_map TBufferAssocContainer; - typedef CHashMap TBufferAssocContainer; + typedef CHashMap TBufferAssocContainer; /// Sound names hash map // typedef std::hash_map TSoundTable; - typedef CHashMap TSoundTable; + typedef CHashMap TSoundTable; /// Assoc from buffer to sound. Used for sound unloading. TBufferAssocContainer _BufferAssoc; diff --git a/code/nel/include/nel/sound/source_common.h b/code/nel/include/nel/sound/source_common.h index 12c781ff6..4cc633957 100644 --- a/code/nel/include/nel/sound/source_common.h +++ b/code/nel/include/nel/sound/source_common.h @@ -150,7 +150,7 @@ protected: NL3D::CCluster *_Cluster; /// An optional user var controler. - NLMISC::CSheetId _UserVarControler; + NLMISC::TStringId _UserVarControler; /// Group controller for gain CGroupController *_GroupController; diff --git a/code/nel/include/nel/sound/u_audio_mixer.h b/code/nel/include/nel/sound/u_audio_mixer.h index fbac4a878..142ce7475 100644 --- a/code/nel/include/nel/sound/u_audio_mixer.h +++ b/code/nel/include/nel/sound/u_audio_mixer.h @@ -382,9 +382,9 @@ public: * Binding from user var to sound parameter is done in * one or more georges sheet .user_var_binding. */ - virtual void setUserVar(NLMISC::CSheetId varName, float value) =0; + virtual void setUserVar(NLMISC::TStringId varName, float value) =0; /// Return the current value of a user var. - virtual float getUserVar(NLMISC::CSheetId varName) =0; + virtual float getUserVar(NLMISC::TStringId varName) =0; //@} //@{ diff --git a/code/nel/samples/sound/sound_sources/main.cpp b/code/nel/samples/sound/sound_sources/main.cpp index fb6753f63..7dc8ecc9b 100644 --- a/code/nel/samples/sound/sound_sources/main.cpp +++ b/code/nel/samples/sound/sound_sources/main.cpp @@ -100,7 +100,7 @@ USource *OnAddSource( const char *name, float x, float y, float z ) /* * Create a source with sound 'name', and set some of its initial properties, if successful */ - USource *source = AudioMixer->createSource( CStringMapper::map(name) ); + USource *source = AudioMixer->createSource( /*CStringMapper::map(name)*/ CSheetId(name) ); if ( source != NULL ) { source->setPos( CVector(x,y,z) ); diff --git a/code/nel/samples/sound/stream_file/stream_file.cpp b/code/nel/samples/sound/stream_file/stream_file.cpp index 06e768625..ed052e8b8 100644 --- a/code/nel/samples/sound/stream_file/stream_file.cpp +++ b/code/nel/samples/sound/stream_file/stream_file.cpp @@ -97,7 +97,7 @@ static void initSample() //NLMISC::CHTimer::startBench(); - s_Source = s_AudioMixer->createSource(CStringMapper::map("stream_file")); + s_Source = s_AudioMixer->createSource(/*CStringMapper::map("stream_file")*/ CSheetId("stream_file")); nlassert(s_Source); s_StreamFileSource = dynamic_cast(s_Source); nlassert(s_StreamFileSource); diff --git a/code/nel/samples/sound/stream_ogg_vorbis/stream_ogg_vorbis.cpp b/code/nel/samples/sound/stream_ogg_vorbis/stream_ogg_vorbis.cpp index c145d6972..fabb93c08 100644 --- a/code/nel/samples/sound/stream_ogg_vorbis/stream_ogg_vorbis.cpp +++ b/code/nel/samples/sound/stream_ogg_vorbis/stream_ogg_vorbis.cpp @@ -87,7 +87,7 @@ static void initSample() //NLMISC::CHTimer::startBench(); - USource *source = s_AudioMixer->createSource(CStringMapper::map("default_stream")); + USource *source = s_AudioMixer->createSource(CSheetId("default_stream")/*CStringMapper::map("default_stream")*/); nlassert(source); s_StreamSource = dynamic_cast(source); nlassert(s_StreamSource); diff --git a/code/nel/src/sound/audio_mixer_user.cpp b/code/nel/src/sound/audio_mixer_user.cpp index a348e57d3..4563ac039 100644 --- a/code/nel/src/sound/audio_mixer_user.cpp +++ b/code/nel/src/sound/audio_mixer_user.cpp @@ -1052,7 +1052,7 @@ public: items->getArrayValue(soundName, i); soundName = soundName.substr(0, soundName.find(".sound")); - cs.SoundNames.push_back(CStringMapper::map(soundName)); + cs.SoundNames.push_back(CSheetId(soundName)/*CStringMapper::map(soundName)*/); } if (!cs.SoundNames.empty()) @@ -1102,7 +1102,7 @@ void CAudioMixerUser::initUserVar() TUserVarControlsContainer::iterator first(_UserVarControls.begin()), last(_UserVarControls.end()); for(; first != last; ++first) { - std::vector::iterator first2(first->second.SoundNames.begin()), last2(first->second.SoundNames.end()); + std::vector::iterator first2(first->second.SoundNames.begin()), last2(first->second.SoundNames.end()); for (; first2 != last2; ++first2) { CSound *sound = getSoundId(*first2); @@ -1133,7 +1133,7 @@ void CAudioMixerUser::CControledSources::serial(NLMISC::IStream &s) for (uint i=0; igetName()).c_str()); + nlwarning("The sound %s contain an infinite recursion !", id->getName().toString()/*CStringMapper::unmap(id->getName()).c_str()*/); return NULL; } @@ -2768,7 +2768,7 @@ void CAudioMixerUser::addEnvironment(const std::string &environmentName, const I } /// Set the current reverb environment -void CAudioMixerUser::setEnvironment(NLMISC::CSheetId environmentName, float roomSize) +void CAudioMixerUser::setEnvironment(NLMISC::TStringId environmentName, float roomSize) { if (_ReverbEffect) { @@ -2777,7 +2777,7 @@ void CAudioMixerUser::setEnvironment(NLMISC::CSheetId environmentName, float roo } /// Get a reverb environment -const IReverbEffect::CEnvironment &CAudioMixerUser::getEnvironment(NLMISC::CSheetId environmentName) +const IReverbEffect::CEnvironment &CAudioMixerUser::getEnvironment(NLMISC::TStringId environmentName) { TEnvironments::iterator it(_Environments.find(environmentName)); if (it == _Environments.end()) diff --git a/code/nel/src/sound/background_sound_manager.cpp b/code/nel/src/sound/background_sound_manager.cpp index ec4c56b70..ab05ab548 100644 --- a/code/nel/src/sound/background_sound_manager.cpp +++ b/code/nel/src/sound/background_sound_manager.cpp @@ -465,7 +465,7 @@ void CBackgroundSoundManager::addFxZone(const std::string &fxName, const std::ve { TFxZone fxZone; - fxZone.FxName = /*CStringMapper::map(fxName)*/ NLMISC::CSheetId(fxName); + fxZone.FxName = CStringMapper::map(fxName); fxZone.Points.resize (points.size()); for (uint j=0; jsetEnvironmentFx(first->FxName.toString()); + rootCluster->setEnvironmentFx(first->FxName); } else { @@ -1461,11 +1461,11 @@ void CBackgroundSoundManager::TFxZone::serial(NLMISC::IStream &s) if (s.isReading()) { s.serial(str); - FxName= NLMISC::CSheetId(str);/*NLMISC::CStringMapper::map(str)*/; + FxName= NLMISC::CStringMapper::map(str); } else { - s.serial(const_cast(FxName.toString()/*NLMISC::CStringMapper::unmap(FxName)*/)); + s.serial(const_cast(NLMISC::CStringMapper::unmap(FxName))); } s.serialCont(Points); diff --git a/code/nel/src/sound/clustered_sound.cpp b/code/nel/src/sound/clustered_sound.cpp index 20693a277..a64e24af4 100644 --- a/code/nel/src/sound/clustered_sound.cpp +++ b/code/nel/src/sound/clustered_sound.cpp @@ -292,7 +292,7 @@ void CClusteredSound::update(const CVector &listenerPos, const CVector &/* view TStringStringMap::iterator it2(_SoundGroupToSound.find(soundGroup)); if (it2 != _SoundGroupToSound.end()) { - NLMISC::CSheetId soundName = it2->second; + NLMISC::TStringId soundName = it2->second; CClusterSound cs; // nldebug("Found the sound [%s] for sound group [%s]", CStringMapper::unmap(soundName).c_str(), CStringMapper::unmap(soundGroup).c_str()); diff --git a/code/nel/src/sound/sound.cpp b/code/nel/src/sound/sound.cpp index 06bfc2c8a..18425bb63 100644 --- a/code/nel/src/sound/sound.cpp +++ b/code/nel/src/sound/sound.cpp @@ -115,7 +115,7 @@ CSound::CSound() : _Looping(false), _MinDist(1.0f), _MaxDist(1000000.0f), - _UserVarControler(NLMISC::CSheetId::Unknown), + _UserVarControler(CStringMapper::emptyId()), _GroupController(NULL) { } diff --git a/code/nel/src/sound/sound_bank.cpp b/code/nel/src/sound/sound_bank.cpp index 58b06b56a..859ee9df3 100644 --- a/code/nel/src/sound/sound_bank.cpp +++ b/code/nel/src/sound/sound_bank.cpp @@ -152,10 +152,10 @@ public: {} // load the values using the george sheet (called by GEORGE::loadForm) - void readGeorges (const NLMISC::CSmartPtr &form, const std::string &name) + void readGeorges (const NLMISC::CSmartPtr &form, const NLMISC::CSheetId &name) { // just call the sound creation method with the xml form. - Sound = CSound::createSound(name, form->getRootNode()); + Sound = CSound::createSound(name.toString(), form->getRootNode()); // success ? // if (_Sound != 0) diff --git a/code/nel/src/sound/source_common.cpp b/code/nel/src/sound/source_common.cpp index 1049b2372..7b27deb03 100644 --- a/code/nel/src/sound/source_common.cpp +++ b/code/nel/src/sound/source_common.cpp @@ -102,7 +102,7 @@ void CSourceCommon::play() _Playing = true; _PlayStart = CTime::getLocalTime(); - if (_UserVarControler != NLMISC::CSheetId::Unknown/*CStringMapper::emptyId()*/) + if (_UserVarControler != CStringMapper::emptyId()) CAudioMixerUser::instance()->addUserControledSource(this, _UserVarControler); } @@ -114,7 +114,7 @@ void CSourceCommon::stop() CAudioMixerUser::instance()->decPlayingSource(); _Playing = false; - if (_UserVarControler != NLMISC::CSheetId::Unknown/*CStringMapper::emptyId()*/) + if (_UserVarControler != CStringMapper::emptyId()) CAudioMixerUser::instance()->removeUserControledSource(this, _UserVarControler); } diff --git a/code/ryzom/client/src/client_cfg.cpp b/code/ryzom/client/src/client_cfg.cpp index 081bc3ad5..ec2ce131a 100644 --- a/code/ryzom/client/src/client_cfg.cpp +++ b/code/ryzom/client/src/client_cfg.cpp @@ -419,7 +419,7 @@ CClientConfig::CClientConfig() // only force patching under Windows by default #ifdef NL_OS_WINDOWS - PatchWanted = true; + PatchWanted = false;//true; #else PatchWanted = false; #endif diff --git a/code/ryzom/client/src/commands.cpp b/code/ryzom/client/src/commands.cpp index f62d8f245..84c9a9ec5 100644 --- a/code/ryzom/client/src/commands.cpp +++ b/code/ryzom/client/src/commands.cpp @@ -5055,14 +5055,14 @@ NLMISC_COMMAND(reloadFogMaps, "Force to reload all the fog maps", "<>") NLMISC_COMMAND(dumpSounds, "Dump names of all loaded sound", "<>") { if (!args.empty()) return false; - std::vector sounds; + std::vector sounds; extern CSoundManager *SoundMngr; if (!SoundMngr) return false; if (!SoundMngr->getMixer()) return false; SoundMngr->getMixer()->getSoundNames(sounds); for(uint k = 0; k < sounds.size(); ++k) { - nlinfo(NLMISC::CStringMapper::unmap(sounds[k]).c_str()); + nlinfo(sounds[k].toString()/*NLMISC::CStringMapper::unmap(sounds[k])*/.c_str()); } return true; } diff --git a/code/ryzom/client/src/sound_manager.cpp b/code/ryzom/client/src/sound_manager.cpp index 4d8827875..948a13a51 100644 --- a/code/ryzom/client/src/sound_manager.cpp +++ b/code/ryzom/client/src/sound_manager.cpp @@ -624,7 +624,7 @@ void CSoundManager::init(IProgressCallback *progressCallBack) // add a new source to the world, attached to the specified entity // return 0 if creation failed, sound id if creation was successful //----------------------------------------------- -CSoundManager::TSourceId CSoundManager::addSource( const NLMISC::TStringId &soundName, const NLMISC::CVector &position, bool play, bool loop, const CEntityId &id) +CSoundManager::TSourceId CSoundManager::addSource( const NLMISC::CSheetId &soundName, const NLMISC::CVector &position, bool play, bool loop, const CEntityId &id) { uint32 retValue = 0; @@ -634,7 +634,7 @@ CSoundManager::TSourceId CSoundManager::addSource( const NLMISC::TStringId &soun // If the source is valid. if(pSource == 0) { - nlwarning("Sound '%s' not found !", CStringMapper::unmap(soundName).c_str()); + nlwarning("Sound '%s' not found !", /*CStringMapper::unmap(soundName).c_str()*/soundName.toString().c_str()); return retValue; } @@ -672,7 +672,7 @@ CSoundManager::TSourceId CSoundManager::addSource( const NLMISC::TStringId &soun // spawn a new source to the world // return false if creation failed, true if creation was successful //----------------------------------------------- -bool CSoundManager::spawnSource(const NLMISC::TStringId &soundName, CSoundContext &context) +bool CSoundManager::spawnSource(const NLMISC::CSheetId &soundName, CSoundContext &context) { if (!_PlaySound) return false; @@ -683,7 +683,7 @@ bool CSoundManager::spawnSource(const NLMISC::TStringId &soundName, CSoundContex // If the source is valid. if(pSource == 0) { - nlwarning("Sound '%s' not found !", soundName); + nlwarning("Sound '%s' not found !", soundName.toString().c_str()); return false; } @@ -702,7 +702,7 @@ bool CSoundManager::spawnSource(const NLMISC::TStringId &soundName, CSoundContex // spawn a new source to the world // return false if creation failed, true if creation was successful //----------------------------------------------- -bool CSoundManager::spawnSource(const NLMISC::TStringId &soundName, const NLMISC::CVector &position) +bool CSoundManager::spawnSource(const NLMISC::CSheetId &soundName, const NLMISC::CVector &position) { if (!_PlaySound) return false; @@ -712,7 +712,7 @@ bool CSoundManager::spawnSource(const NLMISC::TStringId &soundName, const NLMISC // If the source is valid. if(pSource == 0) { - nlwarning("Sound '%s' not found !", CStringMapper::unmap(soundName).c_str ()); + nlwarning("Sound '%s' not found !", /*CStringMapper::unmap(soundName).c_str ()*/soundName.toString().c_str()); return false; } diff --git a/code/ryzom/client/src/sound_manager.h b/code/ryzom/client/src/sound_manager.h index 80401ea57..e4981055f 100644 --- a/code/ryzom/client/src/sound_manager.h +++ b/code/ryzom/client/src/sound_manager.h @@ -32,6 +32,7 @@ // sound #include "nel/sound/u_audio_mixer.h" #include "nel/sound/u_listener.h" +#include "nel/misc/sheet_id.h" extern class CSoundManager *SoundMngr; @@ -88,13 +89,13 @@ public: /// Return the audio mixer instance pointer. NLSOUND::UAudioMixer *getMixer(); - TSourceId addSource( const NLMISC::TStringId &soundName, const NLMISC::CVector &position, bool play = true , bool loop = false, const NLMISC::CEntityId &id = NLMISC::CEntityId::Unknown ); + TSourceId addSource( const NLMISC::CSheetId &soundName, const NLMISC::CVector &position, bool play = true , bool loop = false, const NLMISC::CEntityId &id = NLMISC::CEntityId::Unknown ); /// spawn a new source to the world but sound manager don't keep any link and the sound will be automatically deleted when finnished - bool spawnSource (const NLMISC::TStringId &soundName, NLSOUND::CSoundContext &context); + bool spawnSource (const NLMISC::CSheetId &soundName, NLSOUND::CSoundContext &context); /// spawn a new source to the world but sound manager don't keep any link and the sound will be automatically deleted when finnished - bool spawnSource( const NLMISC::TStringId &soundName, const NLMISC::CVector &position ); + bool spawnSource( const NLMISC::CSheetId &soundName, const NLMISC::CVector &position ); /** * remove a source diff --git a/code/ryzom/common/data_leveldesign/primitives/newbieland/urban_newbieland.primitive b/code/ryzom/common/data_leveldesign/primitives/newbieland/urban_newbieland.primitive index 0aa00b3bb..42cd70726 100644 --- a/code/ryzom/common/data_leveldesign/primitives/newbieland/urban_newbieland.primitive +++ b/code/ryzom/common/data_leveldesign/primitives/newbieland/urban_newbieland.primitive @@ -1,7 +1,7 @@ - + class @@ -126,6 +126,10 @@ #mission tags and pre-requisites replayable solo + mission_category : Killing + player_replay_timer : 10 + global_replay_timer : 10 + mission_icon : tets #Variables declaration decl : bot : giver @@ -138,7 +142,7 @@ mission_title : WELCOME_RYZOM_CORE_TITLE mission_desc : WELCOME_RYZOM_CORE_DESC # step_4 - kill_fauna : chdfa1 3 + kill_fauna : chdfa1 1 recv_money : 10000 @@ -154,6 +158,157 @@ + + + class + mission + + + name + HUNTING_GROUNDS + + + script + # script generated from 'urban_newbieland.primitive' + + #mission tags and pre-requisites + replayable + guild + mission_category : Killing + player_replay_timer : 10 + global_replay_timer : 10 + mission_icon : test + + #Variables declaration + decl : bot : giver + decl : bot : player + decl : bot : chiang_the_strong + + #pre-requisites + req_guild + req_grade : Leader + + #script + mission_title : WELCOME_RYZOM_CORE_DESC + mission_desc : WELCOME_RYZOM_CORE_TITLE + # step_4 + spawn_mission : WELCOME_RYZOM_CORE : chiang_the_strong : guild + set_obj : MIS_DO_MISSION + mission : WELCOME_RYZOM_CORE 2 + kill_fauna : chdfa1 2 + recv_money : 100000 + recv_money : 20: guild + + + + + + class + alias + + + name + alias + + + + + + class + mission + + + name + GUILD_MISSION + + + script + # script generated from 'guild_missions.primitive' + + #mission tags and pre-requisites + replayable + guild + mission_category : Killing + + #Variables declaration + decl : bot : giver + decl : bot : player + decl : bot : chiang_the_strong + + #pre-requisites + req_guild + req_grade : Leader + + #script + mission_title : GUILD_MISSION_TITLE + mission_desc : GUILD_MISSION_DESC + # step + spawn_mission : SOLO_GUILD_MISSION : chiang_the_strong : guild + set_obj : MIS_DO_MISSION + mission : SOLO_GUILD_MISSION 2 + kill_fauna : chdfa1 2 + recv_money : 100: guild + recv_money : 50 + + + + + + class + alias + + + name + alias + + + + + + class + mission + + + name + SOLO_GUILD_MISSION + + + script + # script generated from 'guild_missions.primitive' + + #mission tags and pre-requisites + replayable + solo + mission_category : Killing + not_proposed + + #Variables declaration + decl : bot : giver + decl : bot : player + decl : bot : chiang_the_strong + + #pre-requisites + + #script + mission_title : SOLO_GUILD_MISSION_TITLE + mission_desc : SOLO_GUILD_MISSION_DESC + # step + kill_fauna : chdfa1 1 + recv_money : 20 + + + + + + class + alias + + + name + alias + + + @@ -317,6 +472,46 @@ + + + + chat_parameters + shop:guild_creator + menu: MENU_WHOAMI WHOAMI_GUILD_CLERK + + + class + npc_bot + + + equipment + CU: 4 + CL: 4 + + + is_stuck + true + + + name + creator + + + sheet_client + fyhc3old + + + + + class + alias + + + name + alias + + + @@ -396,19 +591,8 @@ chat_parameters - shop : NEWBIELAND_LARMOR_ALL - item : icmalb.sitem 10 - item : icmalb.sitem 20 - item : icmalb.sitem 50 - item : icfalb.sitem 10 - item : icfalb.sitem 20 - item : icfalb.sitem 50 - item : ictalb.sitem 10 - item : ictalb.sitem 20 - item : ictalb.sitem 50 - item : iczalb.sitem 10 - item : iczalb.sitem 20 - item : iczalb.sitem 50 + shop:guild_creator + menu: MENU_WHOAMI WHOAMI_GUILD_CLERK class @@ -444,6 +628,119 @@ + + + class + npc_folder + + + name + Guild creator + + + + + class + alias + + + name + alias + + + + + class + npc_zone + + + name + Npc Zone + + + + + class + alias + + + name + alias + + + + + bot_sheet_client + maha2 + + + class + npc_group + + + name + Group + + + + class + npc_group_parameters + + + name + parameters + + + + + + class + alias + + + name + alias + + + + + + chat_parameters + shop:guild_creator + menu: MENU_WHOAMI WHOAMI_GUILD_CLERK + + + class + npc_bot + + + equipment + CU: 4 + CL: 4 + + + name + guild_creator + + + sheet_client + fyhc3old + + + + + class + alias + + + name + alias + + + + + + @@ -455,14 +752,38 @@ missions_editor + + audience + solo + + + auto_remove_from_journal + false + + + automatic + false + class mission_tree + + fail_if_inventory_is_full + false + giver_primitive urban_newbieland.primitive + + global_replay_timer + 10 + + + mission_category + Killing + mission_description WELCOME_RYZOM_CORE_DESC @@ -471,10 +792,18 @@ mission_giver $givervar@fullname$ + + mission_icon + tets + mission_title WELCOME_RYZOM_CORE_TITLE + + mono_instance + false + name WELCOME_RYZOM_CORE @@ -483,10 +812,34 @@ need_validation false + + non_abandonnable + false + + + not_in_journal + false + + + not_proposed + false + + + phrase_auto_menu + TEST + + + player_replay_timer + 10 + replayable true + + run_only_once + false + class @@ -571,7 +924,7 @@ fauna/quantity - chdfa1 3 + chdfa1 1 @@ -597,6 +950,263 @@ + + + audience + guild + + + auto_remove_from_journal + false + + + automatic + false + + + class + mission_tree + + + fail_if_inventory_is_full + false + + + giver_primitive + urban_newbieland.primitive + + + global_replay_timer + 10 + + + mission_category + Killing + + + mission_description + WELCOME_RYZOM_CORE_TITLE + + + mission_giver + $givervar@fullname$ + + + mission_icon + test + + + mission_title + WELCOME_RYZOM_CORE_DESC + + + mono_instance + false + + + name + HUNTING_GROUNDS + + + need_validation + false + + + non_abandonnable + false + + + not_in_journal + false + + + not_proposed + false + + + phrase_auto_menu + TEST + + + player_replay_timer + 10 + + + replayable + true + + + run_only_once + false + + + + class + variables + + + name + variables + + + + class + var_npc + + + npc_function + fct_ranger_leader + + + npc_name + chiang_the_strong + + + var_name + givervar + + + + + + class + pre_requisite + + + name + pre_requisite + + + require_guild_grade + Leader + + + require_guild_membership + true + + + + + + class + alias + + + name + alias + + + + + class + step + + + name + step_4 + + + + class + actions + + + name + pre_actions + + + + class + spawn_mission + + + giver_name + chiang_the_strong + + + guild + true + + + mission_name + WELCOME_RYZOM_CORE + + + + + + class + mission_objectives + + + name + objectives + + + + class + do_mission + + + mission_names + WELCOME_RYZOM_CORE 2 + + + overload_objective + MIS_DO_MISSION + + + + + class + kill + + + fauna/quantity + chdfa1 2 + + + name + kill chdfa1 2 + + + + + + class + actions + + + name + post_actions + + + + amount + 100000 + + + class + recv_money + + + + + amount + 20 + + + class + recv_money + + + guild + true + + + + + diff --git a/code/ryzom/server/frontend_service.cfg b/code/ryzom/server/frontend_service.cfg index c9392bd51..a73c02316 100644 --- a/code/ryzom/server/frontend_service.cfg +++ b/code/ryzom/server/frontend_service.cfg @@ -6,7 +6,7 @@ BandwidthRatio = 1; FSUDPPort = 47851; -FSListenHost = "open.ryzom.com"; +FSListenHost = "192.168.1.112"; #include "frontend_service_default.cfg" diff --git a/code/ryzom/server/shard_start_cmake.bat b/code/ryzom/server/shard_start_cmake.bat index 943a0b5f3..9d68b5272 100644 --- a/code/ryzom/server/shard_start_cmake.bat +++ b/code/ryzom/server/shard_start_cmake.bat @@ -3,7 +3,7 @@ REM This script will start all the services with good parameters REM set MODE=Debug -set MODE=..\..\build\bin\Release +set MODE=..\..\build\bin\Debug rem AS start %MODE%\ryzom_admin_service.exe --fulladminname=admin_executor_service --shortadminname=AES