zavage-software/smileyface
1
0
Fork 0
mirror of https://git.zavage.net/Zavage-Software/smileyface.git synced 2024-12-22 12:49:20 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixes for python version

Browse Source
This commit is contained in:
Mathew Guest 2021-08-19 19:35:05 -06:00
parent 92bf222868
commit be9dc63a00
13 changed files with 18 additions and 148 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
README.md
View File

@ -0,0 +1,3 @@
SmileyFace UT Server Tool
=========================

41
files/rulesets/00-Comp-Duelplus10.json
View File

@ -1,41 +0,0 @@
{
"uniqueTag": "DuelPlus10",
"categories": [
"Comp"
],
"title": "Duel+ 10min",
"toolTip": "Ultimate 1v1 test of deathmatch skill",
"description": "Same ruleset, unofficial server.\n\n<UT.Hub.RulesText_Small>Mutators: UT+, TeamSkins, WeaponSkins, HitSounds, CustomHUD, HiddenWeaponsUTPL</>\n<UT.Hub.RulesText_Small>Options: MaxPlayers=2, TimeLimit=10, WeaponStay=OFF, Amp=OFF, PickupTimers=OFF</>",
"mapPrefixes": [],
"maxMapsInList": 0,
"epicMaps": "/Game/RestrictedAssets/Maps/WIP/DM-ASDF,/Game/EpicInternal/Lea/DM-Lea,/Game/RestrictedAssets/Maps/WIP/DM-Solo",
"defaultMap": "/Game/RestrictedAssets/Maps/WIP/DM-ASDF",
"customMapList": [
"/Game/DM-BoneBone_Textured",
"/Game/Maps/DM-Deep-03g",
"/Game/Maps/DM-Erase/DM-EraseV2_a04",
"/Game/dc/Ironic/DM-Alanis"
],
"maxPlayers": 2,
"maxTeamCount": 2,
"maxTeamSize": 1,
"maxPartySize": 1,
"displayTexture": "Texture2D'/Game/RestrictedAssets/UI/GameModeBadges/GB_Duel.GB_Duel'",
"gameMode" : "/Game/dc/FuckDuelSpawns/DuelPlus.DuelPlus_C",
"gameOptions" : "?MaxPlayers=2?TimeLimit=10?ignoreidle=1?GoalScore=0?MaxSpecators=10?ForceNoBots=1?ForceRespawn=1?mutator=UTPlus,UTPlusMovement,MutHitsounds,MutTeamskins,WeaponSkins,CustomHUD,NoPickupTimerMutator,WeaponReplacement?WTR=/Game/UT+/UTPlus/UT+GrenadeLauncher.UT+GrenadeLauncher_C:/Game/UT+/UTPlus/UT+BioRifle.UT+BioRifle_C?",
"requiredPackages" : [
"CustomHUD",
"MutHitSounds",
"MutTeamskins",
"WeaponSkins",
"UTPlus",
"UTPlusMovement",
"NoPickupTimerMutator"
],
"bTeamGame": true,
"bCompetitiveMatch": false,
"optionFlags": 65535,
"bHideFromUI": false,
"minPlayersToStart": 2,
"epicForceUIVisibility": 0
},

41
files/rulesets/00-Comp-Duelplus5.json
View File

@ -1,41 +0,0 @@
{
"uniqueTag": "DuelPlus5",
"categories": [
"Comp"
],
"title": "Duel+ 5min",
"toolTip": "Ultimate 1v1 test of deathmatch skill",
"description": "Same ruleset, unofficial server.\n\n<UT.Hub.RulesText_Small>Mutators: UT+, TeamSkins, WeaponSkins, HitSounds, CustomHUD, HiddenWeaponsUTPL</>\n<UT.Hub.RulesText_Small>Options: MaxPlayers=2, TimeLimit=10, WeaponStay=OFF, Amp=OFF, PickupTimers=OFF</>",
"mapPrefixes": [],
"maxMapsInList": 0,
"epicMaps": "/Game/RestrictedAssets/Maps/WIP/DM-ASDF,/Game/EpicInternal/Lea/DM-Lea,/Game/RestrictedAssets/Maps/WIP/DM-Solo",
"defaultMap": "/Game/RestrictedAssets/Maps/WIP/DM-ASDF",
"customMapList": [
"/Game/DM-BoneBone_Textured",
"/Game/Maps/DM-Deep-03g",
"/Game/Maps/DM-Erase/DM-EraseV2_a04",
"/Game/dc/Ironic/DM-Alanis"
],
"maxPlayers": 2,
"maxTeamCount": 2,
"maxTeamSize": 1,
"maxPartySize": 1,
"displayTexture": "Texture2D'/Game/RestrictedAssets/UI/GameModeBadges/GB_Duel.GB_Duel'",
"gameMode" : "/Game/dc/FuckDuelSpawns/DuelPlus.DuelPlus_C",
"gameOptions" : "?MaxPlayers=2?TimeLimit=5?ignoreidle=1?GoalScore=0?MaxSpecators=10?ForceNoBots=1?ForceRespawn=1?mutator=UTPlus,UTPlusMovement,MutHitsounds,MutTeamskins,WeaponSkins,CustomHUD,NoPickupTimerMutator,WeaponReplacement?WTR=/Game/UT+/UTPlus/UT+GrenadeLauncher.UT+GrenadeLauncher_C:/Game/UT+/UTPlus/UT+BioRifle.UT+BioRifle_C?",
"requiredPackages" : [
"CustomHUD",
"MutHitSounds",
"MutTeamskins",
"WeaponSkins",
"UTPlus",
"UTPlusMovement",
"NoPickupTimerMutator"
],
"bTeamGame": true,
"bCompetitiveMatch": false,
"optionFlags": 65535,
"bHideFromUI": false,
"minPlayersToStart": 2,
"epicForceUIVisibility": 0
},

58
files/rulesets/4-Weapons-Blitz.json
View File

@ -1,58 +0,0 @@
{
"uniqueTag": "MYBLITZ",
"categories": [
"Weapons"
],
"title": "Blitz",
"toolTip": "Blitz Mode",
"description": "Blitz",
"description": "Blitz\n\n<UT.Hub.RulesText_Small>Mutators: UT+, TeamSkins, WeaponSkins, HitSounds</>\n<UT.Hub.RulesText_Small>Options: MaxPlayers=12, TimeLimit=20, WeaponStay=OFF, Translocator=ON</>\n\n<UT.Hub.RulesText_Small>*Under Construction*</>",
"mapPrefixes": [],
"maxMapsInList": 0,
"epicMaps": "",
"defaultMap": "",
"customMapList": [
"/Game/FR-Farage",
"/Game/FR-Ozone",
"/Game/FR-Quarry",
"/Game/GSC/Maps/FR-Scrapyard",
"/Game/Maps/FR-Canyon/FR-CanyonWIP4",
"/Game/Maps/FR-CastleTest03",
"/Game/Maps/FR-ChocolateFactory/FR-ChocolateFactory",
"/Game/Maps/FR-ChocolateFactory/FR-FudgeFactory",
"/Game/Maps/FR-Foundry/FR-Foundry-WIP6",
"/Game/Maps/FR-Horus/FR-Horus_WIP02",
"/Game/Maps/FR-Nova/FR-Nova_CUP",
"/Game/Maps/FR-Nova/FR-Nova_WIP2",
"/Game/Maps/H27/FR-Morphine-Beta005",
"/Game/Maps/Sprint/FR-Sprint-Beta002",
"/Game/Mogno/FR-Chill/FR-Chill_V2",
"/Game/RestrictedAssets/Maps/FR-DormantCoast",
"/Game/RestrictedAssets/Maps/WIP/FR-Blackstone-UC",
"/Game/RestrictedAssets/Maps/WIP/FR-HighRoad-UC",
"/Game/dmshaft/FR-MeltDownpdv2019superior",
"/Game/fr_crescendo/FR-Crescendo",
"/Game/tidu/Maps/FR-Spacecadet_01"
],
"maxPlayers": 12,
"maxTeamCount": 2,
"maxTeamSize": 5,
"maxPartySize": 5,
"displayTexture": "Texture2D'/Game/RestrictedAssets/UI/GameModeBadges/GB_CTF.GB_CTF'",
"gameMode": "/Script/UnrealTournament.UTCTFGameMode",
"gameOptions": "?BalanceTeams=false?TimeLimit=20?GoalScore=0?botfill=2?ignoreidle=1?mutator=MutHitsounds,UTPlus,UTPlusMovement,WeaponSkins,MutTeamskins,NoPickupTimerMutator,NoSpawnProtectionMutator",
"requiredPackages" : [
"MutHitsounds",
"MutTeamskins",
"UTPlus",
"UTPlusMovement",
"WeaponSkins",
"NoPickupTimerMutator",
"NoSpawnProtectionMutator"
],
"bTeamGame": true,
"bCompetitiveMatch": false,
"optionFlags": 65535,
"bHideFromUI": false,
"epicForceUIVisibility": 0
},

2
smileyface/app.py
View File

@ -1,4 +1,5 @@
from . import hub_machine from . import hub_machine
from . import datalayer
import app_skellington import app_skellington
from app_skellington import _util from app_skellington import _util
@ -36,6 +37,7 @@ class SmileyFace(app_skellington.ApplicationContainer):
def _services(self): def _services(self):
self['model'] = lambda: hub_machine.UTServerMachine(self.ctx) self['model'] = lambda: hub_machine.UTServerMachine(self.ctx)
self['datalayer'] = lambda: datalayer.DataLayer(self.ctx)
def interactive_shell(self): def interactive_shell(self):
pass pass

5
smileyface/datalayer.py Normal file
View File

@ -0,0 +1,5 @@
class DataLayer:
def __init__(self, ctx):
self.ctx = ctx

0
smileyface/config_editor.py → smileyface/gameconfig_edit.py
View File

6
smileyface/hub_machine.py
View File

@ -1,4 +1,4 @@
from .config_editor import UnrealIniFile, GameIniSpecial from .gameconfig_edit import UnrealIniFile, GameIniSpecial
from ._util import md5sum_file from ._util import md5sum_file
from app_skellington import _util from app_skellington import _util
@ -412,7 +412,7 @@ ssh {remote_game_host} chown ut4.ut4 {remote_game_dir} -R
project_dir = self.ctx.config['app']['project_dir'] project_dir = self.ctx.config['app']['project_dir']
src_dir = '/'.join([project_dir, 'files/rulesets']) src_dir = '/'.join([project_dir, 'files/rulesets'])
out_dir = '/'.join([project_dir, '/instance/LinuxServer/UnrealTournament/Saved/Rulesets']) out_dir = '/'.join([project_dir, '/instance/LinuxServer/UnrealTournament/Saved/Config/Rulesets'])
out_filename='/'.join([out_dir, 'ruleset.json']) out_filename='/'.join([out_dir, 'ruleset.json'])
cmd = 'mkdir -pv {out_dir}'.format(**{ cmd = 'mkdir -pv {out_dir}'.format(**{
@ -423,7 +423,7 @@ ssh {remote_game_host} chown ut4.ut4 {remote_game_dir} -R
self.ctx.log['ut4'].info('out filename=%s', out_filename) self.ctx.log['ut4'].info('out filename=%s', out_filename)
# echo {\"rules\":[ > "$OUT_FILENAME" # echo {\"rules\":[ > "$OUT_FILENAME"
cmd = 'echo {{\"rules\":[ > "{out_filename}"'.format(out_filename=out_filename) cmd = "echo '{{\"rules\":[' > \"{out_filename}\"".format(out_filename=out_filename)
self._invoke_command(cmd) self._invoke_command(cmd)
cmd = 'for f in "{src_dir}"/*.json ; do cat "$f" >> "{out_filename}" ; done'.format( cmd = 'for f in "{src_dir}"/*.json ; do cat "$f" >> "{out_filename}" ; done'.format(

0
smileyface/server_onoff.py Normal file
View File

0
smileyface/server_upload.py Normal file
View File

2
ut4-server-ctl.sh
View File

@ -119,7 +119,7 @@
# BELOW has been moved to vars-dallas # BELOW has been moved to vars-dallas
# ---------------------------------------- # ----------------------------------------
# #
export PROJECT_DIR="/home/mathew/dev/zavage/ut4-server-ctl" export PROJECT_DIR="/home/mathew/dev/zavage/smileyface"
# #
# # For creating RedirectReferences= Lines # # For creating RedirectReferences= Lines
# export REDIRECT_PROTOCOL="https" # export REDIRECT_PROTOCOL="https"

4
vars-dallas
View File

@ -1,5 +1,5 @@
export PROJECT_DIR="/home/mathew/dev/zavage/ut4-server-ctl" export PROJECT_DIR="/home/mathew/dev/zavage/smileyface"
export CONFIG_DIR="/home/mathew/dev/zavage/ut4-server-ctl/server-dallas/config" export CONFIG_DIR="/home/mathew/dev/zavage/smileyface/server-dallas/config"
export REDIRECT_PROTOCOL="https" export REDIRECT_PROTOCOL="https"
export REDIRECT_URL="ut4-redirect.zavage.net" export REDIRECT_URL="ut4-redirect.zavage.net"

4
vars-fremont
View File

@ -1,5 +1,5 @@
export PROJECT_DIR="/home/mathew/dev/zavage/ut4-server-ctl" export PROJECT_DIR="/home/mathew/dev/zavage/smileyface"
export CONFIG_DIR="/home/mathew/dev/zavage/ut4-server-ctl/server-fremont/config" export CONFIG_DIR="/home/mathew/dev/zavage/smileyface/server-fremont/config"
export REDIRECT_PROTOCOL="https" export REDIRECT_PROTOCOL="https"
export REDIRECT_URL="ut4-redirect.zavage.net" export REDIRECT_URL="ut4-redirect.zavage.net"