Skip to content

Daily Merge #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ob1bob69 merged 4 commits into from
Mar 9, 2014
Merged

Daily Merge #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2702c9b
Merge pull request #21 from ob1bob69/master
ismooch Mar 8, 2014
61235b8
update landclaim.sk and moderate.sk
ismooch Mar 8, 2014
57cab50
Merge branch 'master' of https://github.com/ismooch/skript
ismooch Mar 8, 2014
6a19c7b
update fortune.sk
ismooch Mar 8, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
156 changes: 78 additions & 78 deletions Obam-Survival/fortune.sk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
#The Fortune Aura will cause minerals a chance to drop extras but at the cost of notifying everyone else to your location.
#Parts
#Toggle for alerts
#Toggle for alerts
#command on/off
#rising chance vs. time



command /fortune [<text>] [<text>]
command /fortune [<text>] [<text>]:
permission: obam.free
description: For all Fortune Aura related commands
usage: &c/fortune (alerts, aura)
trigger:
argument 1 is blank:
argument 1 is not set:
send "&7You have a &6%{fortune.chance}%%&7 chance to find extra ores/gems" to player
argument 1 is "help" or "h":
message "&3--[&6&lFortune Help&3]--"
Expand All @@ -24,14 +24,14 @@ command /fortune [<text>] [<text>]
message "&7 Places/removes an aura on you that will cause you"
message "&7 to occasionally find extra ores/gems while mining."
argument 1 is "alerts":
argument 2 is blank:
argument 2 is not set :
send "&cYou must choose &6on&c or &6off&c." to player
argument 2 is "on":
set {fortune.alert.%player%} to true
argument 2 is "off":
set {fortune.alert.%player%} to false
argument 1 is "aura":
argument 2 is blank:
argument 2 is not set:
send "&cYou must choose &6on&c or &6off&c." to player
argument 2 is "on":
{fortune.aura.%player%} is true:
Expand All @@ -43,21 +43,21 @@ command /fortune [<text>] [<text>]
set {fortune.spam.%player%} to 0

every 15 minutes:
loop all players:
{fortune.aura.%player%} is true:
player does not have permission: "obam.plus":
{fortune.chance.%player%} is less than 5:
increase {fortune.chance.%player%} by 1
send "&7Your chances of fortune have increased!" to player
player does not have permission "obam.ultimate":
player has permission "obam.plus":
{fortune.chance.%player%} is less than 10:
increase {fortune.chance.%player%} by 1
send "&7Your chances of fortune have increased!" to player
player has permission "obam.ultimate":
{fortune.chance.%player%} is less than 15
increase {fortune.chance.%player%} by 1
send "&7Your chances of fortune have increased!" to player
loop all players:
{fortune.aura.%loop-player%} is true
loop-player does not have permission "obam.plus":
{fortune.chance.%loop-player%} is less than 5:
increase {fortune.chance.%loop-player%} by 1
send "&7Your chances of fortune have increased!" to loop-player
loop-player does not have permission "obam.ultimate":
loop-player has permission "obam.plus":
{fortune.chance.%loop-player%} is less than 10:
increase {fortune.chance.%loop-player%} by 1
send "&7Your chances of fortune have increased!" to loop-player
loop-player has permission "obam.ultimate":
{fortune.chance.%loop-player%} is less than 15:
increase {fortune.chance.%loop-player%} by 1
send "&7Your chances of fortune have increased!" to loop-player

on break:
{fortune.aura.%player%} is true:
Expand All @@ -67,75 +67,75 @@ on break:
{fortune.alert.%loop-player%} is true:
broadcast "&a&1It seems %player% hit the %block% jackpot at %location of player%!"
set {fortune.spam.%player%} to 0
block is diamond ore:
add 1 to {fortune.spam.%player%}
chance of {fortune.chance.%player%}%:
player's tool is a pickaxe of silk touch:
send "&cYour fortune aura has no effect with this enchantment!" to player
stop
send "&aFortune favours you!" to player
drop 1 diamond
add 1 to {fortune.spam.%player%}
block is diamond ore:
add 1 to {fortune.spam.%player%}
chance of {fortune.chance.%player%}%:
player's tool is a pickaxe of silk touch:
send "&cYour fortune aura has no effect with this enchantment!" to player
stop
send "&aFortune favours you!" to player
drop 1 diamond
add 1 to {fortune.spam.%player%}
block is emerald ore:
add 1 to {fortune.spam.%player%}
chance of {fortune.chance.%player%}%:
player's tool is a pickaxe of silk touch:
send "&cYour fortune aura has no effect with this enchantment!" to player
stop
send "&aFortune favours you!" to player
add 1 to {fortune.spam.%player%}
chance of {fortune.chance.%player%}%:
player's tool is a pickaxe of silk touch:
send "&cYour fortune aura has no effect with this enchantment!" to player
stop
send "&aFortune favours you!" to player
drop 1 emerald
add 1 to{fortune.spam.%player%}
add 1 to {fortune.spam.%player%}
block is gold ore:
add 1 to {fortune.spam.%player%}
chance of {fortune.chance.%player%}%:
player's tool is a pickaxe of silk touch:
send "&cYour fortune aura has no effect with this enchantment!" to player
stop
send "&aFortune favours you!" to player
add 1 to {fortune.spam.%player%}
chance of {fortune.chance.%player%}%:
player's tool is a pickaxe of silk touch:
send "&cYour fortune aura has no effect with this enchantment!" to player
stop
send "&aFortune favours you!" to player
drop 1 gold ingot
add 1 to{fortune.spam.%player%}
add 1 to {fortune.spam.%player%}
block is iron ore:
add 1 to {fortune.spam.%player%}
chance of {fortune.chance.%player%}%:
player's tool is a pickaxe of silk touch:
send "&cYour fortune aura has no effect with this enchantment!" to player
stop
send "&aFortune favours you!" to player
add 1 to {fortune.spam.%player%}
chance of {fortune.chance.%player%}%:
player's tool is a pickaxe of silk touch:
send "&cYour fortune aura has no effect with this enchantment!" to player
stop
send "&aFortune favours you!" to player
drop 1 iron ingot
add 1 to{fortune.spam.%player%}
add 1 to {fortune.spam.%player%}
block is lapis ore:
add 1 to {fortune.spam.%player%}
chance of {fortune.chance.%player%}%:
player's tool is a pickaxe of silk touch:
send "&cYour fortune aura has no effect with this enchantment!" to player
stop
send "&aFortune favours you!" to player
add 1 to {fortune.spam.%player%}
chance of {fortune.chance.%player%}%:
player's tool is a pickaxe of silk touch:
send "&cYour fortune aura has no effect with this enchantment!" to player
stop
send "&aFortune favours you!" to player
drop 1 lapis
add 1 to{fortune.spam.%player%}
add 1 to {fortune.spam.%player%}
block is redstone ore:
add 1 to {fortune.spam.%player%}
chance of {fortune.chance.%player%}%:
player's tool is a pickaxe of silk touch:
send "&cYour fortune aura has no effect with this enchantment!" to player
stop
send "&aFortune favours you!" to player
add 1 to {fortune.spam.%player%}
chance of {fortune.chance.%player%}%:
player's tool is a pickaxe of silk touch:
send "&cYour fortune aura has no effect with this enchantment!" to player
stop
send "&aFortune favours you!" to player
drop 1 redstone
add 1 to{fortune.spam.%player%}
add 1 to {fortune.spam.%player%}
block is coal ore:
add 1 to {fortune.spam.%player%}
chance of {fortune.chance.%player%}%:
player's tool is a pickaxe of silk touch:
send "&cYour fortune aura has no effect with this enchantment!" to player
stop
send "&aFortune favours you!" to player
add 1 to {fortune.spam.%player%}
chance of {fortune.chance.%player%}%:
player's tool is a pickaxe of silk touch:
send "&cYour fortune aura has no effect with this enchantment!" to player
stop
send "&aFortune favours you!" to player
drop 1 coal
add 1 to{fortune.spam.%player%}
add 1 to {fortune.spam.%player%}
block is nether quartz ore:
add 1 to {fortune.spam.%player%}
chance of {fortune.chance.%player%}%:
player's tool is a pickaxe of silk touch:
send "&cYour fortune aura has no effect with this enchantment!" to player
stop
send "&aFortune favours you!" to player
add 1 to {fortune.spam.%player%}
chance of {fortune.chance.%player%}%:
player's tool is a pickaxe of silk touch:
send "&cYour fortune aura has no effect with this enchantment!" to player
stop
send "&aFortune favours you!" to player
drop 1 nether quartz
add 1 to{fortune.spam.%player%}
add 1 to {fortune.spam.%player%}
23 changes: 22 additions & 1 deletion Obam-Survival/landclaim.sk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,6 +248,9 @@ command /front [<text>] [<text>] [<text>]:
if {chunk.live.%chunk at location of player%} is not name of player:
message "&cThis is not your land!"
stop
argument 1 is "set":
send "&cThat is an invalid name!" to player
stop
message "&aYou have named this Front to &e%argument 2%"
set {chunk.name.%chunk at location of player%} to "%argument 2%"
add {chunk.name.%chunk at location of player%} to {name.list.%player%::*}
Expand Down Expand Up @@ -303,6 +306,16 @@ command /front [<text>] [<text>] [<text>]:
send "&cYou do not have a Front named &e%argument 2%"
stop
argument 3 is set:
argument 3 is "set":
if {chunk.live.%chunk at location of player%} is not set:
message "&cThis land has not been claimed."
stop
if {chunk.live.%chunk at location of player%} is not name of player:
message "&cThis is not your land!"
stop
set {loc.chunks.%player%::%chunk at location of player%} to location of player
send "&aYour travel location for this area, has been moved" to player
stop
if {chunk.live.%chunk at location of player%} is not set:
message "&cYou can only do this in &eTown&c, or on your land!"
stop
Expand Down Expand Up @@ -602,7 +615,15 @@ command /townclaim:
command /owner <text>:
permission: obam.admin
trigger:
set {chunk.live.%chunk at location of player%} to argument
add 1 to {chunks.claim.count.%argument%}
add argument to {land.live.%chunk at location of player%::*}
set {chunk.live.%chunk at location of player%} to argument
set {chunk.live.%chunk at location of player%.%argument%} to true
add chunk at location of player to {owned.chunks.%argument%::*}
set {chunk.name.%chunk at location of player%} to "%{chunks.claim.count.%argument%}%"
set {loc.chunks.%argument%::%chunk at location of player%} to location of player
message "&6%argument% now owns this Front."
send "&cPlease remember to adjust for tickets!"

on command "/hub":
cancel event
Expand Down
40 changes: 40 additions & 0 deletions Obam-Tools/moderate.sk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,14 @@ command /kick <player> <text>:
strike lightning effect at player-argument
kick player-argument due to "&cKicked by &4%player%&c! Reason: &4Breaking the Rules"
broadcast "&r%player-argument%&c was kicked by &r%player%&c. Reason: Breaking the Rules"
log "%player-argument%^KICK^%player%^NO REASON SET" to "admin/ACTIONS.log"
stop
else:
create a safe explosion of force 1 at player-argument
strike lightning effect at player-argument
kick player-argument due to "&cKicked by &4%player%&c! Reason: &4%argument-2%"
broadcast "&r%player-argument%&c was kicked by &r%player%&c. Reason: %argument-2%"
log "%player-argument%^KICK^%player%^%argument 2%" to "admin/ACTIONS.log"
stop


Expand All @@ -30,6 +32,7 @@ command /ban <offline player> <text>:
kick offlineplayer-argument because of argument 2
ban "%offlineplayer-argument%"
broadcast "&e%offlineplayer-argument%&c &lwas banned by &e%player%. &c&lReason: &e%argument-2%"
log "%offlineplayer-argument%^BAN^%player%^%argument 2%" to "admin/ACTIONS.log"
stop


Expand All @@ -38,12 +41,49 @@ command /g <player>:
description: Teleports to a Player
permission: obam.mod
trigger:
{monitor.%player%} is not set:
set {monitor.%player%} to false
player does not have permission "obam.admin":
{monitor.%player%} is false:
send "&cYou must be in monitor mode to do this!" to player
stop

teleport player to player-argument
send "&aYou have teleported to %player-argument%." to player

command /grab <player>:
permission: obam.mod
trigger:
player-argument is player:
send "&cYou should not grab yourself in public!" to player
stop
teleport player-argument to player
send "&aYou have snatched %player-argument%." to player
send "&aYou have been snatched by %player%!" to player-argument


command /monitor:
permission: obam.mod
trigger:

{monitor.%player%} is true:
set {monitor.%player%} to false
reveal player to all players
disallow player to fly
teleport player to {loc.mon.%player%}
send "&aYou are no longer in monitor mode! You have been returned to your position!"
stop
{monitor.%player%} is not set:
set {monitor.%player%} to false
{monitor.%player%} is false:
set {loc.mon.%player%} to location of player
set {monitor.%player%} to true
hide player from all players
allow player to fly
send "&aYou are now in monitor mode!" to player


every 1 second:
loop all players:
{monitor.%loop-player%} is true:
hide loop-player from all players