Skip to content

Daily Merge #14

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 6 commits into from
Mar 30, 2014
Merged

Daily Merge #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
26b2a69
Merge pull request #23 from ob1bob69/master
ismooch Mar 23, 2014
5824bb1
added abstain.sk
ismooch Mar 24, 2014
55499c5
prizewheel work
ismooch Mar 24, 2014
454d70e
update prizehweel.sk
ismooch Mar 25, 2014
3145182
live prizewheel added plus hooks
ismooch Mar 30, 2014
5a2735f
added beta of tma.sk
ismooch Mar 30, 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
907 changes: 770 additions & 137 deletions OBAM-Voting/prizewheel.sk
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions Obam-General/ihs.sk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,8 @@ command /sudo [<player>] [<text>]:
executable by: console and players
permission: obam.admin
trigger:
send "%argument 1%"
send "%argument 2%"
has permission "obam.staff.admin"
make player-argument execute command "%argument 2%"

Expand Down
16 changes: 16 additions & 0 deletions Obam-Survival/fortune.sk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,15 @@ command /aura [<text>] [<text>] [text]:
permission: obam.free
description: For all Aura related commands
trigger:
{abstain.%player%} is true:
send "&cThis feature is unavailable while abstaining"
stop
{abstain.%player%} is "wait abstain":
send "&cThis feature is unavailable while abstaining"
stop
{abstain.%player%} is "wait pvp":
send "&cThis feature is unavailable while abstaining"
stop
argument 1 is not set:
{current.aura.%player%} is not set:
send "&7You do not have an active aura! Use &e/aura list&7 for a list of available auras"
Expand Down Expand Up @@ -76,6 +85,9 @@ every 15 minutes:
{fortune.spam.%loop-player%} is greater than 15:
set {fortune.spam.%loop-player%} to 0
{current.aura.%loop-player%} is "fortune"
{abstain.%loop-player%} is true:
clear {current.aura.%loop-player%}

loop-player does not have permission "obam.plus":
{fortune.chance.%loop-player%} is less than 5:
increase {fortune.chance.%loop-player%} by 1
Expand All @@ -100,6 +112,10 @@ on break:
{for.ran.%player%} is not set:
set {for.ran.%player%} to random integer between 5 and 15
{current.aura.%player%} is "fortune":
{abstain.%player%} is true:
clear {current.aura.%player%}
{abstain.%player%} is "wait abstain":
clear {current.auar.%player%}
block is diamond ore or emerald ore or gold ore or iron ore or lapis ore or redstone ore or coal ore or nether quartz ore:
player's tool is a pickaxe of silk touch:
send "&cYour fortune aura has no effect with this enchantment!" to player
Expand Down
27 changes: 26 additions & 1 deletion Obam-Survival/landclaim.sk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,14 @@
variables:
{claimedland.%player%} = 0
{availableland.live.%player%} = 1

{alert.fronts.%player%} = true


on join:
{db_prizecheck.%player%} is set:
add {db_prizecheck.%player%} to {availableland.%player%}
send "&aYou have had &e%{db_prizecheck.%player%}%&a added to your Fronts balance!" to player
clear {db_prizecheck.%player%}
if {played.%player%} is not set:
set {played.%player%} to true
{reset.%player%.betamove} is not set:
Expand Down Expand Up @@ -41,14 +45,20 @@ every 1 tick:
{alert.notify.owner.%loop-player%} is not {chunk.live.%chunk at location of loop-player%}:
{chunk.live.%chunk at location of loop-player%} is not set:
{alert.notify.owner.%loop-player%} is not "Unclaimed":
{alert.fronts.%loop-player%} is true

send "&a&lUnclaimed Front" to loop-player
set {alert.notify.owner.%loop-player%} to "Unclaimed"
set {land.unclaim.%loop-player%} to true
{chunk.live.%chunk at location of loop-player%} is set:
{alert.fronts.%loop-player%} is false:
stop
send "&a&lFront Claimed by: &e%{chunk.live.%chunk at location of loop-player%} %" to loop-player
set {alert.notify.owner.%loop-player%} to {chunk.live.%chunk at location of loop-player%}
{alert.notify.owner.%loop-player%} is not set:
{chunk.live.%chunk at location of loop-player%} is not set:
{alert.fronts.%loop-player%} is false:
stop
send "&a&lUnclaimed Front" to loop-player
set {alert.notify.owner.%loop-player%} to "Unclaimed"
set {land.unclaim.%loop-player%} to true
Expand Down Expand Up @@ -343,6 +353,21 @@ command /front [<text>] [<text>] [<text>]:
stop
send "&c%argument 3% does not have a Front named &e%argument 2%"
stop
argument 1 is "alert":
{alert.fronts.%player%} is not set:
send "&aFront alerts are now &eoff"
set {alert.fronts.%player%} to false
stop
{alert.fronts.%player%} is false:
send "&aFront alerts are now &eon"
set {alert.fronts.%player%} to true
stop
{alert.fronts.%player%} is true:
send "&aFront alerts are now &eoff"
set {alert.fronts.%player%} to false
stop





Expand Down
127 changes: 127 additions & 0 deletions Obam-Testing/abstain.sk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,127 @@
variables:
{abstain.%player%} = false



command /abstain [<text>]:
permission: obam.free
trigger:

argument is not set:
send " "
send " &aYour Abstain status is currently &e%{abstain.%player%}%&a, you can change this by doing &e/abstain confirm&a. "
send " "
send "&aThis change will cost &e2500 Tickets&a."
send " "
set {abst.confirm.%player%} to now
stop
player has permission "obam.admin":
{abstain.%player%} is false:
set {abstain.%player%} to true

send "&aYour Abstain status is now &e%{abstain.%player%}%"
stop

{abstain.%player%} is true:
set {abstain.%player%} to false
send "&aYour Abstain status is now &e%{abstain.%player%}%"
stop

stop

argument is "confirm" or "c":
set {_hold} to difference between now and {abst.confirm.%player%}
{_hold} is greater than 30 seconds:
send "&cYou must do &e/abstain&a before doing the confirm command"
stop

{abstain.%player%} is not set:
set {abstain.%player%} to false
{abstain.%player%} is false:
set {_bal} to player's balance
{_bal} is less than 2500:
send "&cYou do not have enough tickets to perform this operation"
stop
remove 2500 from player's balance
set {abstain.%player%} to "wait abstain"
set {abstain.%player%.time} to now
send "&aYou have abstained from PvP. You will lose access to some features. You have paid a toll of &e2500 Tickets&a."
send "&aIt can take up to &e2 hours&a for your abstain feature to take affect."
send "&aYou know have &e%player's balance%&a."
stop
{abstain.%player%} is true:
set {_bal} to player's balance
{_bal} is less than 2500:
send "&cYou do not have enough tickets to perform this operation"
stop
remove 2500 from player's balance
set {abstain.%player%} to "wait pvp"
set {abstain.%player%.time} to now
send "&aYou are engaging in PvP. You will be susceptible to PvP fights. You have paid a toll of &e2500 Tickets&a."
send "&aIt can take up to &e2 Hours&a for your PvP entering process to take affect."
send "&aYou now have &e%player's balance%&a."
stop

{abstain.%player%} is "wait pvp":
send "&cYou already have an Abstain process waiting. It can take up to 2 hours for this change to take an effect"
stop
{abstain.%player%} is "wait abstain":
send "&cYou already have an Abstain process waiting. It can take up to 2 hours for this change to take an effect"
stop

on damage:
victim is a player
attacker is a player
{abstain.%victim%} is true:
cancel event
{abstain.%attacker%} is true:
send "&cYou can not engage in PvP while abstaining!"
cancel event

every 1 hour:
loop all players:
{abstain.%loop-player%} is "wait pvp":
set {_hold} to difference between {abstain.%loop-player%.time} and now
{_hold} is more than 1 hour
set {abstain.%loop-player%} to false
execute console command "perms player %loop-player% set nametags.color.blue false"
execute console command "perms player %loop-player% set nametags.color.red"
send "&aYou are now able to PvP!" to loop-player
{abstain.%loop-player%} is "wait abstain":
set {_hold} to difference between {abstain.%loop-player%.time} and now
{_hold} is more than 1 hour
set {abstain.%loop-player%} to true
execute console command "perms player %loop-player% set nametags.color.red false"
execute console command "perms player %loop-player% set nametags.color.blue"
send "&aYou are now abstaining from PvP!" to loop-player

on connect:
player is "ISMOOCH":
stop
{abstain.%player%} is true:
player does not have permission "nametags.color.blue":
execute console command "perms player %player% set nametags.color.blue"
player has permission "nametags.color.red":
execute console command "perms player %player% set nametags.color.red false"
{abstain.%player%} is false:
player does not have permission "nametags.color.red":
execute console command "perms player %player% set nametags.color.red"
player has permission "nametags.color.blue":
execute console command "perms player %player% set nametags.color.blue false"
{abstain.%player%} is "wait pvp":
set {_hold} to difference between {abstain.%player%.time} and now
{_hold} is more than 1 hour:
set {abstain.%player%} to false
send "&aYou can now PvP!"
execute console command "perms player %player% set nametags.color.blue false"
execute console command "perms player %player% set nametags.color.red"
stop

{abstain.%player%} is "wait abstain":
set {_hold} to difference between {abstain.%player%.time} and now
{_hold} is more than 1 hour:
set {abstain.%player%} to true
send "&aYou are now abstaining from PvP!"
execute console command "perms player %player% set nametags.color.red false"
execute console command "perms player %player% set nametags.color.blue"
stop
Loading