From 87585588fcfd3850c2d8e5a7e8d39b8716f209af Mon Sep 17 00:00:00 2001 From: kaetemi Date: Mon, 4 Jun 2012 15:03:40 +0200 Subject: [PATCH] Reverted: Unnecessary changes to config and data from merge --- .../newbieland/urban_newbieland.primitive | 642 +----------------- code/ryzom/server/frontend_service.cfg | 2 +- code/ryzom/server/shard_start_cmake.bat | 2 +- 3 files changed, 18 insertions(+), 628 deletions(-) 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 42cd70726..0aa00b3bb 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,10 +126,6 @@ #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 @@ -142,7 +138,7 @@ mission_title : WELCOME_RYZOM_CORE_TITLE mission_desc : WELCOME_RYZOM_CORE_DESC # step_4 - kill_fauna : chdfa1 1 + kill_fauna : chdfa1 3 recv_money : 10000 @@ -158,157 +154,6 @@ - - - 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 - - - @@ -472,46 +317,6 @@ - - - - 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 - - - @@ -591,8 +396,19 @@ chat_parameters - shop:guild_creator - menu: MENU_WHOAMI WHOAMI_GUILD_CLERK + 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 class @@ -628,119 +444,6 @@ - - - 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 - - - - - - @@ -752,38 +455,14 @@ 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 @@ -792,18 +471,10 @@ mission_giver $givervar@fullname$ - - mission_icon - tets - mission_title WELCOME_RYZOM_CORE_TITLE - - mono_instance - false - name WELCOME_RYZOM_CORE @@ -812,34 +483,10 @@ 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 @@ -924,7 +571,7 @@ fauna/quantity - chdfa1 1 + chdfa1 3 @@ -950,263 +597,6 @@ - - - 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 a73c02316..c9392bd51 100644 --- a/code/ryzom/server/frontend_service.cfg +++ b/code/ryzom/server/frontend_service.cfg @@ -6,7 +6,7 @@ BandwidthRatio = 1; FSUDPPort = 47851; -FSListenHost = "192.168.1.112"; +FSListenHost = "open.ryzom.com"; #include "frontend_service_default.cfg" diff --git a/code/ryzom/server/shard_start_cmake.bat b/code/ryzom/server/shard_start_cmake.bat index 9d68b5272..943a0b5f3 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\Debug +set MODE=..\..\build\bin\Release rem AS start %MODE%\ryzom_admin_service.exe --fulladminname=admin_executor_service --shortadminname=AES