Dissolve ctf_pvp_engine modpack into other modpacks

minetest.conf

@@ -26,7 +26,6 @@ ctf.flag.drop_time = 300
 
 ctf.allocate_mode = 3
 ctf.players_can_change_team = false
-ctf.node_ownership = false
 ctf.friendly_fire = false
 ctf.autoalloc_on_joinplayer = true
 

mods/ctf_pvp_engine/.gitignore

@@ -1,215 +0,0 @@
-#################
-## Eclipse
-#################
-
-*.pydevproject
-.project
-.metadata
-bin/
-tmp/
-*.tmp
-*.bak
-*.swp
-*~.nib
-local.properties
-.classpath
-.settings/
-.loadpath
-
-# External tool builders
-.externalToolBuilders/
-
-# Locally stored "Eclipse launch configurations"
-*.launch
-
-# CDT-specific
-.cproject
-
-# PDT-specific
-.buildpath
-
-
-#################
-## Visual Studio
-#################
-
-## Ignore Visual Studio temporary files, build results, and
-## files generated by popular Visual Studio add-ons.
-
-# User-specific files
-*.suo
-*.user
-*.sln.docstates
-
-# Build results
-
-[Dd]ebug/
-[Rr]elease/
-x64/
-build/
-[Bb]in/
-[Oo]bj/
-
-# MSTest test Results
-[Tt]est[Rr]esult*/
-[Bb]uild[Ll]og.*
-
-*_i.c
-*_p.c
-*.ilk
-*.meta
-*.obj
-*.pch
-*.pdb
-*.pgc
-*.pgd
-*.rsp
-*.sbr
-*.tlb
-*.tli
-*.tlh
-*.tmp
-*.tmp_proj
-*.log
-*.vspscc
-*.vssscc
-.builds
-*.pidb
-*.log
-*.scc
-
-# Visual C++ cache files
-ipch/
-*.aps
-*.ncb
-*.opensdf
-*.sdf
-*.cachefile
-
-# Visual Studio profiler
-*.psess
-*.vsp
-*.vspx
-
-# Guidance Automation Toolkit
-*.gpState
-
-# ReSharper is a .NET coding add-in
-_ReSharper*/
-*.[Rr]e[Ss]harper
-
-# TeamCity is a build add-in
-_TeamCity*
-
-# DotCover is a Code Coverage Tool
-*.dotCover
-
-# NCrunch
-*.ncrunch*
-.*crunch*.local.xml
-
-# Installshield output folder
-[Ee]xpress/
-
-# DocProject is a documentation generator add-in
-DocProject/buildhelp/
-DocProject/Help/*.HxT
-DocProject/Help/*.HxC
-DocProject/Help/*.hhc
-DocProject/Help/*.hhk
-DocProject/Help/*.hhp
-DocProject/Help/Html2
-DocProject/Help/html
-
-# Click-Once directory
-publish/
-
-# Publish Web Output
-*.Publish.xml
-*.pubxml
-
-# NuGet Packages Directory
-## TODO: If you have NuGet Package Restore enabled, uncomment the next line
-#packages/
-
-# Windows Azure Build Output
-csx
-*.build.csdef
-
-# Windows Store app package directory
-AppPackages/
-
-# Others
-sql/
-*.Cache
-ClientBin/
-[Ss]tyle[Cc]op.*
-~$*
-*~
-*.dbmdl
-*.[Pp]ublish.xml
-*.pfx
-*.publishsettings
-
-# RIA/Silverlight projects
-Generated_Code/
-
-# Backup & report files from converting an old project file to a newer
-# Visual Studio version. Backup files are not needed, because we have git ;-)
-_UpgradeReport_Files/
-Backup*/
-UpgradeLog*.XML
-UpgradeLog*.htm
-
-# SQL Server files
-App_Data/*.mdf
-App_Data/*.ldf
-
-#############
-## Windows detritus
-#############
-
-# Windows image file caches
-Thumbs.db
-ehthumbs.db
-
-# Folder config file
-Desktop.ini
-
-# Recycle Bin used on file shares
-$RECYCLE.BIN/
-
-# Mac crap
-.DS_Store
-
-
-#############
-## Python
-#############
-
-*.py[co]
-
-# Packages
-*.egg
-*.egg-info
-dist/
-build/
-eggs/
-parts/
-var/
-sdist/
-develop-eggs/
-.installed.cfg
-
-# Installer logs
-pip-log.txt
-
-# Unit test / coverage reports
-.coverage
-.tox
-
-#Translations
-*.mo
-
-#Mr Developer
-.mr.developer.cfg

mods/ctf_pvp_engine/README.md

@@ -1,23 +0,0 @@
-CTF PvP Engine
-==============
-
-A highly modular framework for the Minetest game engine, in order to allow
-the development of Capture the Flag / City vs City games. Good for any
-sort of game where players can join teams - flags are optional, everything
-is highly configurable.
-
-Licenses
-========
-
-Created by: [rubenwardy](http://rubenwardy.com/).  
-Copyright (c) 2013 - 2015  
-**Code:** LGPL 2.1 or later.  
-**Textures:** CC-BY-SA 3.0
-
-ctf_flag/sounds/trumpet* by tobyk, license: CC-BY 3.0
-from: http://freesound.org/people/tobyk/sounds/26198/
-
-Documentation
-=============
-
-See the doc_* files, starting with doc_project_overview.md

mods/ctf_pvp_engine/ctf_protect/depends.txt

@@ -1 +0,0 @@
-ctf

mods/ctf_pvp_engine/ctf_protect/init.lua

@@ -1,28 +0,0 @@
--- This mod is used to protect nodes in the capture the flag game
-ctf.register_on_init(function()
-	ctf.log("chat", "Initialising...")
-
-	-- Settings: Chat
-	ctf._set("node_ownership",          true)
-end)
-
-local old_is_protected = minetest.is_protected
-
-function minetest.is_protected(pos, name)
-	if not ctf.setting("node_ownership") then
-		return old_is_protected(pos, name)
-	end
-
-	local team = ctf.get_territory_owner(pos)
-
-	if not team or not ctf.team(team) then
-		return old_is_protected(pos, name)
-	end
-
-	if ctf.player(name).team == team then
-		return old_is_protected(pos, name)
-	else
-		minetest.chat_send_player(name, "You cannot dig on team "..team.."'s land")
-		return true
-	end
-end

settings_cache.csv

@@ -45,5 +45,4 @@
 "match.team.2.pos"   "-22,66,-78"
 "match.teams"   2
 "maximum_in_team"   -1
-"node_ownership"   false
 "players_can_change_team"   false