Skip to content

Commit

Permalink
Merge pull request #98 from Dynamictivity/medieval-engineers-integration
Browse files Browse the repository at this point in the history
Medieval engineers integration
  • Loading branch information
Theaxiom committed Jun 6, 2015
2 parents 5467b57 + 1544a6f commit 2c14a0a
Show file tree
Hide file tree
Showing 136 changed files with 11,965 additions and 1,922 deletions.
File renamed without changes.
2 changes: 1 addition & 1 deletion app/Config/SKEL/SERVER_SCRIPTS/cron.bat
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
@ECHO OFF
call "C:\xampp\htdocs\hecpanel\app\Console\cake.bat" Instances.se_server cron -app "C:\xampp\htdocs\hecpanel\app"
call "C:\xampp\htdocs\hecpanel\app\Console\cake.bat" Instances.se_server cron -app "C:\xampp\htdocs\hecpanel\app" > cron.log
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
<?xml version="1.0"?>
<MyConfigDedicated xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<SessionSettings>
<GameMode>{game_mode}</GameMode>
<InventorySizeMultiplier>1</InventorySizeMultiplier>
<AssemblerSpeedMultiplier>1</AssemblerSpeedMultiplier>
<AssemblerEfficiencyMultiplier>1</AssemblerEfficiencyMultiplier>
<RefinerySpeedMultiplier>1</RefinerySpeedMultiplier>
<OnlineMode>PUBLIC</OnlineMode>
<MaxPlayers>{max_players}</MaxPlayers>
<MaxFloatingObjects>256</MaxFloatingObjects>
<EnvironmentHostility>SAFE</EnvironmentHostility>
<AutoHealing>true</AutoHealing>
<EnableCopyPaste>false</EnableCopyPaste>
<WeaponsEnabled>true</WeaponsEnabled>
<ShowPlayerNamesOnHud>true</ShowPlayerNamesOnHud>
<ThrusterDamage>true</ThrusterDamage>
<CargoShipsEnabled>true</CargoShipsEnabled>
<EnableSpectator>true</EnableSpectator>
<RemoveTrash>false</RemoveTrash>
<WorldSizeKm>0</WorldSizeKm>
<RespawnShipDelete>true</RespawnShipDelete>
<ResetOwnership>false</ResetOwnership>
<WelderSpeedMultiplier>1</WelderSpeedMultiplier>
<GrinderSpeedMultiplier>1</GrinderSpeedMultiplier>
<RealisticSound>false</RealisticSound>
<ClientCanSave>{client_can_save}</ClientCanSave>
<HackSpeedMultiplier>0.33</HackSpeedMultiplier>
<PermanentDeath>true</PermanentDeath>
<AutoSaveInMinutes>{auto_save_in_minutes}</AutoSaveInMinutes>
<SpawnShipTimeMultiplier>1</SpawnShipTimeMultiplier>
<DestructibleBlocks>true</DestructibleBlocks>
<EnableIngameScripts>true</EnableIngameScripts>
<ViewDistance>20000</ViewDistance>
<EnableToolShake>true</EnableToolShake>
<VoxelGeneratorVersion>0</VoxelGeneratorVersion>
<EnableOxygen>false</EnableOxygen>
<Enable3rdPersonView>true</Enable3rdPersonView>
<EnableEncounters>true</EnableEncounters>
<Battle>false</Battle>
<EnableStructuralSimulation>{enable_structural_simulation}</EnableStructuralSimulation>
<EnableBarbarians>{enable_barbarians}</EnableBarbarians>
<MaxActiveFracturePieces>{max_active_fracture_pieces}</MaxActiveFracturePieces>
<GameDayInRealMinutes>{game_day_in_real_minutes}</GameDayInRealMinutes>
<DayNightRatio>{day_night_ratio}</DayNightRatio>
<EnableAnimals>{enable_animals}</EnableAnimals>
<MaximumBots>{maximum_bots}</MaximumBots>
</SessionSettings>
<Scenario>
<TypeId>MyObjectBuilder_ScenarioDefinition</TypeId>
<SubtypeId>{scenario_subtype_id}</SubtypeId>
</Scenario>
<LoadWorld>{load_world}</LoadWorld>
<IP>0.0.0.0</IP>
<SteamPort>8766</SteamPort>
<ServerPort>{server_port}</ServerPort>
<AsteroidAmount>0</AsteroidAmount>
{server_admins}
<Banned />
<Mods />
<GroupID>{group_id}</GroupID>
<ServerName>{server_name}</ServerName>
<WorldName>{world_name}</WorldName>
<PauseGameWhenEmpty>{pause_game_when_empty}</PauseGameWhenEmpty>
<IgnoreLastSession>{ignore_last_session}</IgnoreLastSession>
</MyConfigDedicated>
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
<?xml version="1.0"?>
<MyConfigDedicated xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<SessionSettings>
<GameMode>Survival</GameMode>
<InventorySizeMultiplier>1</InventorySizeMultiplier>
<AssemblerSpeedMultiplier>1</AssemblerSpeedMultiplier>
<AssemblerEfficiencyMultiplier>1</AssemblerEfficiencyMultiplier>
<RefinerySpeedMultiplier>1</RefinerySpeedMultiplier>
<OnlineMode>PUBLIC</OnlineMode>
<MaxPlayers>4</MaxPlayers>
<MaxFloatingObjects>256</MaxFloatingObjects>
<EnvironmentHostility>SAFE</EnvironmentHostility>
<AutoHealing>true</AutoHealing>
<EnableCopyPaste>false</EnableCopyPaste>
<WeaponsEnabled>true</WeaponsEnabled>
<ShowPlayerNamesOnHud>true</ShowPlayerNamesOnHud>
<ThrusterDamage>true</ThrusterDamage>
<CargoShipsEnabled>true</CargoShipsEnabled>
<EnableSpectator>true</EnableSpectator>
<RemoveTrash>false</RemoveTrash>
<WorldSizeKm>0</WorldSizeKm>
<RespawnShipDelete>true</RespawnShipDelete>
<ResetOwnership>false</ResetOwnership>
<WelderSpeedMultiplier>1</WelderSpeedMultiplier>
<GrinderSpeedMultiplier>1</GrinderSpeedMultiplier>
<RealisticSound>false</RealisticSound>
<ClientCanSave>true</ClientCanSave>
<HackSpeedMultiplier>0.33</HackSpeedMultiplier>
<PermanentDeath>true</PermanentDeath>
<AutoSaveInMinutes>5</AutoSaveInMinutes>
<SpawnShipTimeMultiplier>1</SpawnShipTimeMultiplier>
<DestructibleBlocks>true</DestructibleBlocks>
<EnableIngameScripts>true</EnableIngameScripts>
<ViewDistance>20000</ViewDistance>
<EnableToolShake>true</EnableToolShake>
<VoxelGeneratorVersion>0</VoxelGeneratorVersion>
<EnableOxygen>false</EnableOxygen>
<Enable3rdPersonView>true</Enable3rdPersonView>
<EnableEncounters>true</EnableEncounters>
<Battle>false</Battle>
<EnableStructuralSimulation>true</EnableStructuralSimulation>
<EnableBarbarians>true</EnableBarbarians>
<MaxActiveFracturePieces>400</MaxActiveFracturePieces>
<GameDayInRealMinutes>20</GameDayInRealMinutes>
<DayNightRatio>0.6666667</DayNightRatio>
<EnableAnimals>true</EnableAnimals>
<MaximumBots>10</MaximumBots>
</SessionSettings>
<Scenario>
<TypeId>MyObjectBuilder_ScenarioDefinition</TypeId>
<SubtypeId>Quickstart</SubtypeId>
</Scenario>
<LoadWorld />
<IP>0.0.0.0</IP>
<SteamPort>8766</SteamPort>
<ServerPort>27016</ServerPort>
<AsteroidAmount>0</AsteroidAmount>
<Administrators />
<Banned />
<Mods />
<GroupID>0</GroupID>
<ServerName>Test1</ServerName>
<WorldName>Test2</WorldName>
<PauseGameWhenEmpty>true</PauseGameWhenEmpty>
<IgnoreLastSession>false</IgnoreLastSession>
</MyConfigDedicated>
Empty file.
Empty file.
Empty file.
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version="1.0"?>
<MyObjectBuilder_LastLoadedTimes xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<LastLoaded>
<dictionary />
</LastLoaded>
</MyObjectBuilder_LastLoadedTimes>
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,9 @@
<VoxelGeneratorVersion>1</VoxelGeneratorVersion>
<EnableOxygen>{enable_oxygen}</EnableOxygen>
<ViewDistance>{view_distance}</ViewDistance>
<EnableToolShake>{enable_tool_shake}</EnableToolShake>
<Enable3rdPersonView>{enable_3rd_person_view}</Enable3rdPersonView>
<EnableEncounters>{enable_encounters}</EnableEncounters>
</SessionSettings>
<Scenario>
<TypeId>MyObjectBuilder_ScenarioDefinition</TypeId>
Expand Down
107 changes: 25 additions & 82 deletions app/Config/Schema/hse.sql
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
-- http://www.phpmyadmin.net
--
-- Host: 127.0.0.1
-- Generation Time: May 03, 2015 at 05:33 AM
-- Generation Time: Jun 06, 2015 at 09:47 AM
-- Server version: 5.6.24
-- PHP Version: 5.5.24

Expand Down Expand Up @@ -60,7 +60,7 @@ CREATE TABLE IF NOT EXISTS `configurations` (
`value` varchar(255) NOT NULL,
`created` datetime NOT NULL,
`updated` datetime NOT NULL
) ENGINE=InnoDB AUTO_INCREMENT=7 DEFAULT CHARSET=latin1;
) ENGINE=InnoDB AUTO_INCREMENT=19 DEFAULT CHARSET=latin1;

--
-- Dumping data for table `configurations`
Expand All @@ -72,7 +72,19 @@ INSERT INTO `configurations` (`id`, `name`, `configuration_scope`, `role_id`, `v
(3, 'serviceAdminId', 'Hecpanel.App', NULL, '53eef38e-c88c-4f8a-bd9a-09948468e7ff', '2015-02-03 08:10:48', '2015-02-03 08:10:48'),
(4, 'allowedActions', 'Hecpanel.Controller.InstanceProfiles', 3, 'edit,add,delete,index,duplicate', '2014-11-11 09:42:38', '2015-05-03 04:29:32'),
(5, 'allowedActions', 'Hecpanel.Controller.Instances', 3, 'index,start,stop,cycle,check,add,edit,reroll,instance_log', '2014-11-11 09:27:36', '2014-11-17 00:31:34'),
(6, 'allowedActions', 'Hecpanel.Controller.Users', 3, 'edit', '2014-11-29 11:28:32', '2014-11-29 11:28:32');
(6, 'allowedActions', 'Hecpanel.Controller.Users', 3, 'edit', '2014-11-29 11:28:32', '2014-11-29 11:28:32'),
(7, 'prohibitedFields', 'Hecpanel.Form.InstanceProfile', NULL, 'name,game_id,server_admins,user_id,server_port,server_name,world_name,group_id,load_world,pause_game_when_empty,ignore_last_session,auto_save_in_minutes,max_players,online_mode,created,updated', '2015-05-14 09:14:13', '2015-05-15 08:54:50'),
(8, 'appUrl', 'Hecpanel.App', NULL, 'http://demo.hecpanel.com', '2015-05-14 09:46:05', '2015-05-14 09:46:05'),
(9, 'appName', 'Hecpanel.App', NULL, 'HEcPanel', '2015-05-14 09:46:35', '2015-05-14 09:46:35'),
(10, 'environment', 'Hecpanel.App', NULL, 'DEV', '2015-05-14 09:47:00', '2015-05-14 09:47:00'),
(11, 'googleAnalyticsId', 'Hecpanel.App', NULL, 'UA-5187184-20', '2015-05-14 09:47:58', '2015-05-14 09:47:58'),
(12, 'allowedActions', 'Hecpanel.Controller.Users', NULL, 'signup,confirm,logout,login,forgot,reset,eula', '2015-05-14 09:49:24', '2015-05-14 09:49:24'),
(13, 'newAccountSubject', 'Hecpanel.Email', NULL, 'Welcome to the Hosted Engineers Control Panel', '2015-05-14 09:50:00', '2015-05-14 09:50:00'),
(14, 'newInstanceSubject', 'Hecpanel.Email', NULL, 'Your Hosted Engineers Server Instance is Created', '2015-05-14 09:50:18', '2015-05-14 09:50:18'),
(15, 'resetAccountSubject', 'Hecpanel.Email', NULL, 'Reset Your Hosted Engineers Control Panel Password', '2015-05-14 09:50:34', '2015-05-14 09:50:34'),
(16, 'defaultRoleId', 'Hecpanel.Users', NULL, '4', '2015-05-14 09:51:18', '2015-05-14 09:51:18'),
(17, 'confirmedRoleId', 'Hecpanel.Users', NULL, '3', '2015-05-14 09:51:36', '2015-05-14 09:51:36'),
(18, 'prohibitedFields', 'Hecpanel.Form.InstanceType', NULL, 'name,game_id,load_world,server_port,server_admins,group_id,server_name,world_name,created,updated', '2015-05-15 08:20:09', '2015-05-15 09:05:46');

-- --------------------------------------------------------

Expand All @@ -86,7 +98,6 @@ CREATE TABLE IF NOT EXISTS `host_servers` (
`hostname` varchar(255) NOT NULL,
`ip` varchar(255) NOT NULL,
`instance_count` int(11) NOT NULL DEFAULT '0',
`instance_limit` int(11) NOT NULL DEFAULT '0',
`created` datetime NOT NULL,
`updated` datetime NOT NULL
) ENGINE=InnoDB DEFAULT CHARSET=latin1;
Expand All @@ -101,6 +112,7 @@ CREATE TABLE IF NOT EXISTS `instances` (
`id` varchar(36) NOT NULL,
`user_id` varchar(36) NOT NULL,
`host_server_id` varchar(36) NOT NULL,
`game_id` int(11) NOT NULL,
`name` varchar(255) NOT NULL,
`group_id` bigint(20) NOT NULL DEFAULT '0',
`server_admins` text NOT NULL,
Expand All @@ -122,40 +134,8 @@ CREATE TABLE IF NOT EXISTS `instance_profiles` (
`id` varchar(36) NOT NULL,
`name` varchar(255) NOT NULL,
`user_id` varchar(36) NOT NULL,
`game_mode` varchar(255) NOT NULL,
`inventory_size_multiplier` decimal(4,2) NOT NULL,
`assembler_speed_multiplier` decimal(4,2) NOT NULL,
`assembler_efficiency_multiplier` decimal(4,2) NOT NULL,
`refinery_speed_multiplier` decimal(4,2) NOT NULL,
`online_mode` varchar(255) NOT NULL,
`max_floating_objects` int(11) NOT NULL,
`environment_hostility` varchar(255) NOT NULL,
`auto_healing` varchar(255) NOT NULL,
`enable_copy_paste` varchar(255) NOT NULL,
`auto_save` varchar(255) NOT NULL,
`weapons_enabled` varchar(255) NOT NULL,
`show_player_names_on_hud` varchar(255) NOT NULL,
`thruster_damage` varchar(255) NOT NULL,
`cargo_ships_enabled` varchar(255) NOT NULL,
`enable_spectator` varchar(255) NOT NULL,
`remove_trash` varchar(255) NOT NULL,
`world_size_km` int(11) NOT NULL,
`respawn_ship_delete` varchar(255) NOT NULL,
`reset_ownership` varchar(255) NOT NULL,
`welder_speed_multiplier` decimal(4,2) NOT NULL,
`grinder_speed_multiplier` decimal(4,2) NOT NULL,
`realistic_sound` varchar(255) NOT NULL,
`client_can_save` varchar(255) NOT NULL,
`hack_speed_multiplier` decimal(4,2) NOT NULL,
`permanent_death` varchar(255) NOT NULL,
`spawn_ship_time_multiplier` decimal(4,2) NOT NULL,
`procedural_density` decimal(3,2) NOT NULL,
`procedural_seed` bigint(20) NOT NULL,
`destructible_blocks` varchar(255) NOT NULL,
`enable_ingame_scripts` varchar(255) NOT NULL,
`enable_oxygen` varchar(255) NOT NULL,
`view_distance` int(11) NOT NULL,
`scenario_subtype_id` varchar(255) NOT NULL,
`game_id` int(11) NOT NULL,
`profile_settings` text NOT NULL,
`created` datetime NOT NULL,
`updated` datetime NOT NULL
) ENGINE=InnoDB DEFAULT CHARSET=latin1;
Expand All @@ -169,45 +149,8 @@ CREATE TABLE IF NOT EXISTS `instance_profiles` (
CREATE TABLE IF NOT EXISTS `instance_types` (
`id` int(11) NOT NULL,
`name` varchar(255) NOT NULL,
`game_mode` varchar(255) NOT NULL,
`inventory_size_multiplier` decimal(4,2) NOT NULL,
`assembler_speed_multiplier` decimal(4,2) NOT NULL,
`assembler_efficiency_multiplier` decimal(4,2) NOT NULL,
`refinery_speed_multiplier` decimal(4,2) NOT NULL,
`online_mode` varchar(255) NOT NULL,
`max_players` int(11) NOT NULL,
`max_floating_objects` int(11) NOT NULL,
`environment_hostility` varchar(255) NOT NULL,
`auto_healing` varchar(255) NOT NULL,
`enable_copy_paste` varchar(255) NOT NULL,
`auto_save` varchar(255) NOT NULL,
`weapons_enabled` varchar(255) NOT NULL,
`show_player_names_on_hud` varchar(255) NOT NULL,
`thruster_damage` varchar(255) NOT NULL,
`cargo_ships_enabled` varchar(255) NOT NULL,
`enable_spectator` varchar(255) NOT NULL,
`remove_trash` varchar(255) NOT NULL,
`world_size_km` int(11) NOT NULL,
`respawn_ship_delete` varchar(255) NOT NULL,
`reset_ownership` varchar(255) NOT NULL,
`welder_speed_multiplier` decimal(4,2) NOT NULL,
`grinder_speed_multiplier` decimal(4,2) NOT NULL,
`realistic_sound` varchar(255) NOT NULL,
`client_can_save` varchar(255) NOT NULL,
`hack_speed_multiplier` decimal(4,2) NOT NULL,
`permanent_death` varchar(255) NOT NULL,
`auto_save_in_minutes` int(11) NOT NULL,
`spawn_ship_time_multiplier` decimal(4,2) NOT NULL,
`procedural_density` decimal(3,2) NOT NULL,
`procedural_seed` bigint(20) NOT NULL,
`destructible_blocks` varchar(255) NOT NULL,
`enable_ingame_scripts` varchar(255) NOT NULL,
`enable_oxygen` varchar(255) NOT NULL,
`view_distance` int(11) NOT NULL,
`scenario_subtype_id` varchar(255) NOT NULL,
`asteroid_amount` int(11) NOT NULL,
`pause_game_when_empty` varchar(255) NOT NULL,
`ignore_last_session` varchar(255) NOT NULL,
`game_id` int(11) NOT NULL,
`profile_settings` text NOT NULL,
`created` datetime NOT NULL,
`updated` datetime NOT NULL
) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=latin1;
Expand All @@ -216,10 +159,10 @@ CREATE TABLE IF NOT EXISTS `instance_types` (
-- Dumping data for table `instance_types`
--

INSERT INTO `instance_types` (`id`, `name`, `game_mode`, `inventory_size_multiplier`, `assembler_speed_multiplier`, `assembler_efficiency_multiplier`, `refinery_speed_multiplier`, `online_mode`, `max_players`, `max_floating_objects`, `environment_hostility`, `auto_healing`, `enable_copy_paste`, `auto_save`, `weapons_enabled`, `show_player_names_on_hud`, `thruster_damage`, `cargo_ships_enabled`, `enable_spectator`, `remove_trash`, `world_size_km`, `respawn_ship_delete`, `reset_ownership`, `welder_speed_multiplier`, `grinder_speed_multiplier`, `realistic_sound`, `client_can_save`, `hack_speed_multiplier`, `permanent_death`, `auto_save_in_minutes`, `spawn_ship_time_multiplier`, `procedural_density`, `procedural_seed`, `destructible_blocks`, `enable_ingame_scripts`, `enable_oxygen`, `view_distance`, `scenario_subtype_id`, `asteroid_amount`, `pause_game_when_empty`, `ignore_last_session`, `created`, `updated`) VALUES
(1, 'Small Server', 'Survival', '1.00', '1.00', '1.00', '1.00', 'PUBLIC', 5, 255, 'SAFE', 'true', 'false', 'true', 'true', 'true', 'true', 'false', 'false', 'true', 20, 'true', 'false', '1.00', '1.00', 'false', 'true', '0.33', 'true', 20, '1.00', '0.00', 0, 'true', 'true', 'true', 2000, 'EasyStart1', 10, 'true', 'false', '2014-11-02 12:23:14', '2014-11-12 07:54:37'),
(2, 'Medium Server', 'Survival', '1.00', '1.00', '1.00', '1.00', 'PUBLIC', 10, 255, 'SAFE', 'true', 'false', 'true', 'true', 'true', 'true', 'false', 'false', 'true', 20, 'true', 'false', '1.00', '1.00', 'false', 'true', '0.33', 'true', 20, '1.00', '0.00', 0, 'true', 'true', 'true', 2000, 'EasyStart1', 10, 'true', 'false', '2014-11-02 12:23:14', '2014-11-12 08:14:41'),
(3, 'Large Server', 'Survival', '1.00', '1.00', '1.00', '1.00', 'PUBLIC', 15, 255, 'SAFE', 'true', 'false', 'true', 'true', 'true', 'true', 'false', 'false', 'true', 20, 'true', 'false', '1.00', '1.00', 'false', 'true', '0.33', 'true', 20, '1.00', '0.00', 0, 'true', 'true', 'true', 2000, 'EasyStart1', 10, 'true', 'false', '2014-11-02 12:23:14', '2014-11-12 07:54:16');
INSERT INTO `instance_types` (`id`, `name`, `game_id`, `profile_settings`, `created`, `updated`) VALUES
(1, 'Small Server', 0, '', '2014-11-02 12:23:14', '2014-11-12 07:54:37'),
(2, 'Medium Server', 0, '', '2014-11-02 12:23:14', '2014-11-12 08:14:41'),
(3, 'Large Server', 0, '', '2014-11-02 12:23:14', '2014-11-12 07:54:16');

-- --------------------------------------------------------

Expand Down Expand Up @@ -336,7 +279,7 @@ ALTER TABLE `command_queues`
-- AUTO_INCREMENT for table `configurations`
--
ALTER TABLE `configurations`
MODIFY `id` int(11) NOT NULL AUTO_INCREMENT,AUTO_INCREMENT=7;
MODIFY `id` int(11) NOT NULL AUTO_INCREMENT,AUTO_INCREMENT=19;
--
-- AUTO_INCREMENT for table `instance_types`
--
Expand Down
Loading

0 comments on commit 2c14a0a

Please sign in to comment.