Skip to content

Daily Merge #16

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 2 commits into from
Apr 5, 2014
Merged

Daily Merge #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a03377e
SmooChat 2
ismooch Apr 4, 2014
1177d81
added who.sk and bugs.sk
ismooch Apr 5, 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
87 changes: 70 additions & 17 deletions OBAM-Voting/prizewheel.sk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
command /prize [<text>] [<text>] [<text>]:
command /prize [<text>] [<text>] [<text>] [<integer>]:
trigger:
argument 1 is not set:

Expand All @@ -10,9 +10,26 @@ command /prize [<text>] [<text>] [<text>]:
send "&e/prize balance"
send "&7Check your available balance of Prize Tokens"
send " "
player has permission "obam.admin":
send "&e/prize balance <playername>"
send "&7Check the balance of another player [Admin]"
send " "
send "&e/prize balance set <playername> <amount>"
send "&7Set the balance for another player [Admin]"
send " "
send "&e/prize spin"
send "&7Spin the prize wheel! (only once every 12 hours)"
send " "
send "&e/prize claim"
send "&7Execute in either Fronts or Skyblock to receive your won items"
send " "
player has permission "obam.admin":
send "&e/prize list <playername>"
send "&7Execute in either Fronts or Skyblock to see the item chest for listed player [Admin]"
send " "
send "&e/prize delete <playername> <itemname>"
send "&7Execute in either Fronts or Skyblock to delete selected item from seleted player [Admin]"
send " "
send "&e/prize"
send "&7Open this help menu"
send " "
Expand All @@ -21,13 +38,21 @@ command /prize [<text>] [<text>] [<text>]:
argument 1 is "balance" or "b":
argument 2 is set:
player has permission "obam.smod":
{db_votetokens.%argument 2%} is not set:
send "&aThis player has no tokens." to player
stop
{db_votetokens.%argument 2%} is 0:
send "&aThis player has no tokens." to player
argument 2 is not "set":
{db_votetokens.%argument 2%} is not set:
send "&aThis player has no tokens." to player
stop
{db_votetokens.%argument 2%} is 0:
send "&aThis player has no tokens." to player
stop
send "&e%argument 2% &ahas &e%{db_votetokens.%argument 2%}%&a tokens" to player
argument 2 is "set":
argument 4 is not set:
send "&cYou must set a number:&e /prize set %argument 3% <number>"
stop
set {db_votetokens.%argument 3%} to argument 4
send "&e%argument 3% &anow has &e%{db_votetokens.%argument 3%}%&a Prize tokens"
stop
send "&e%argument 2% &ahas &e%{db_votetokens.%argument 2%}%&a tokens" to player
{db_votetokens.%player%} is not set:
send "&aYou do not have any Prize Tokens!!! Please vote to receive some!" to player
stop
Expand All @@ -53,8 +78,12 @@ command /prize [<text>] [<text>] [<text>]:
loop {db_winnings.chest.%player%.fronts::*}:
send "%loop-index%.....%loop-value%"
argument 2 is set:

loop {db_winnings.chest.%argument 2%.fronts::*}:
send "%loop-index%....%loop-value%"
{_loop.count} is not set:
set {_loop.count} to 0
add 1 to {_loop.count}
send "%{_loop.count}%..%loop-index%....%loop-value%"

argument 1 is "delete":
player does not have permission "obam.admin":
Expand All @@ -70,7 +99,18 @@ command /prize [<text>] [<text>] [<text>]:
delete {db_winnings.chest.%argument 2%.skyblock::%argument 3%}

world is "world":
delete {db_winnings.chest.%argument 2%.fronts::%argument 3%}
loop {db_winnings.chest.%argument 2%.fronts::*}:
{_loop.count} is not set:
set {_loop.count} to 0
add 1 to {_loop.count}
"%{_loop.count}%" is argument 3
send "&cDeleteing %loop-index%..."
set {_del} to loop-index
delete {db_winnings.chest.%argument 2%.fronts::%{_del}%}
{db_winnings.chest.%argument 2%.fronts::%{_del}%} is set:
send "&cError!"
stop



send "&cDeleted..."
Expand Down Expand Up @@ -598,16 +638,16 @@ command /prize [<text>] [<text>] [<text>]:
stop

{_ran} is 21:
{db_winnings.chest.%player%.fronts::diamond pickaxe of unbreaking 2 and effiiciency 3 and fortune 2} is not set:
set {db_winnings.chest.%player%.fronts::diamond pickaxe of unbreaking 2 and effiiciency 3 and fortune 2} to 1
send "&aYou have won &e1 diamond pickaxe of unbreaking 2 and effiiciency 3 and fortune 2&a for &eFronts!"
{db_winnings.chest.%player%.fronts::diamond pickaxe of unbreaking 2 and efficiency 3 and fortune 2} is not set:
set {db_winnings.chest.%player%.fronts::diamond pickaxe of unbreaking 2 and efficiency 3 and fortune 2} to 1
send "&aYou have won &e1 diamond pickaxe of unbreaking 2 and efficiency 3 and fortune 2&a for &eFronts!"
send "&aUse &e/prize claim&a in Fronts to claim!"
log "%player%^ADD^1^diamond pickaxe of unbreaking 2 and effiiciency 3 and fortune 2^UNCOMMON PRIZE db_winnings" to "prizewheel/db_winnings.log"
log "%player%^ADD^1^diamond pickaxe of unbreaking 2 and efficiency 3 and fortune 2^UNCOMMON PRIZE db_winnings" to "prizewheel/db_winnings.log"
stop
add 1 to {db_winnings.chest.%player%.fronts::diamond pickaxe of unbreaking 2 and effiiciency 3 and fortune 2}
send "&aYou have won &e1 diamond pickaxe of unbreaking 2 and effiiciency 3 and fortune 2&a for &eFronts!"
add 1 to {db_winnings.chest.%player%.fronts::diamond pickaxe of unbreaking 2 and efficiency 3 and fortune 2}
send "&aYou have won &e1 diamond pickaxe of unbreaking 2 and efficiency 3 and fortune 2&a for &eFronts!"
send "&aUse &e/prize claim&a in Fronts to claim!"
log "%player%^ADD^1^diamond pickaxe of unbreaking 2 and effiiciency 3 and fortune 2^UNCOMMON PRIZE db_winnings" to "prizewheel/db_winnings.log"
log "%player%^ADD^1^diamond pickaxe of unbreaking 2 and efficiency 3 and fortune 2^UNCOMMON PRIZE db_winnings" to "prizewheel/db_winnings.log"
stop

{_ran} is 22:
Expand Down Expand Up @@ -795,6 +835,10 @@ command /prize [<text>] [<text>] [<text>]:
command /prizedrop <text> <text>:
permission: obam.free
trigger:
player doesn't have space for a oak sapling:
send "&cMake space in your inventory first!"
stop

argument 2 is "diamond chestplate of ubreaking 2 and protection 2":
set {_item.hold} to "diamond chestplate of unbreaking 2 and protection 2"
argument 2 is "enderpearl":
Expand All @@ -804,7 +848,7 @@ command /prizedrop <text> <text>:
{_item.hold} is set:
set {_item} to "%{_item.hold}%" parsed as item
set {_loop} to {db_winnings.chest.%player%.%argument 1%::%argument 2%}
drop {_loop} of {_item} at location of player
give {_loop} of {_item} to player

clear {db_winnings.chest.%player%.%argument 1%::%argument 2%}

Expand All @@ -815,3 +859,12 @@ command /prizefix <text> <text>:
{db_prizecheck.%argument 1%} is not set:
set {db_prizecheck.%argument 1%} to 0
add 1 to {db_prizecheck.%argument 1%}

command /fixbook:
permission: obamm.free
trigger:
player's tool is enchanted book:
set {_hold} to "%player's tool%"
set {_hold} to {_hold} parsed as item
send "%{_hold}%"
set player's tool to 403 of unbreaking 4
16 changes: 16 additions & 0 deletions Obam-General/who.sk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
every 10 seconds:
clear {db_fronts.who.2::*}
loop all players:
add loop-player to {db_fronts.who.2::*}


command /who:
trigger:

loop all players:
add loop-player to {_cur.list::*}
clear {db_fronts.who.2::*}
set {db_fronts.who.2::*} to {_cur.list::*}
send "&eHub:&a%{db_hub.who::*}%"
send "&eWTF:&a%{db_wtf.who::*}%"
send "&eFronts:&a%{_cur.list::*}%"
11 changes: 7 additions & 4 deletions Obam-Survival/landclaim.sk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,23 +42,26 @@ on join:

every 1 tick:
loop all players:
{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"
{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
{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
Expand Down
4 changes: 4 additions & 0 deletions Obam-Testing/broadcast.sk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
command /broadcast <text>:
permission: obam.admin
trigger:
broadcast argument
175 changes: 175 additions & 0 deletions Obam-Testing/bugs.sk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,175 @@
command /bug [<text>]:
trigger:
argument is not set:
send "&e/bug <text>"
send "&7Use this to report a bug directly to devs"
stop





{db_bugs} is not set:
set {db_bugs} to 0
add 1 to {db_bugs}
set {_message} to "~%{db_bugs}% %argument%"
set {db_bugs.list::%{_message}%} to player
set {db_bugs.list::%{_message}%::status} to "&aOPEN"
set {db_bugs.list::%{_message}%::assigned} to "&cNone"
set {db_bugs.list::%{_message}%::number} to {db_bugs}
send "&aYour bug has been added"
stop

command /buga [<text>] [<text>] [<text>]:
permission: obam.mechanic
trigger:

argument 1 is "list":

argument 2 is not set:

loop {db_bugs.list::*}:
{db_bugs.list::%loop-index%::status} is not "&cClosed"
send "%{db_bugs.list::%loop-index%::number}%.&a%loop-index%...By:&e%loop-value%&a...%{db_bugs.list::%loop-index%::status}%"

argument 2 is "all":

loop {db_bugs.list::*}:
send "%{db_bugs.list::%loop-index%::number}%.&a%loop-index%...By:&e%loop-value%&a...%{db_bugs.list::%loop-index%::status}%"

argument 2 is "open":

loop {db_bugs.list::*}:
{db_bugs.list::%loop-index%::status} is "&aOpen" or "&aOPEN"
send "%{db_bugs.list::%loop-index%::number}%.&a%loop-index%...By:&e%loop-value%&a...%{db_bugs.list::%loop-index%::status}%"


argument 2 is "pending":

loop {db_bugs.list::*}:
{db_bugs.list::%loop-index%::status} is "&ePending"
send "%{db_bugs.list::%loop-index%::number}%.&a%loop-index%...By:&e%loop-value%&a...%{db_bugs.list::%loop-index%::status}%"



argument 2 is "player":
argument 3 is not set:
loop {db_bugs.list::*}:
{db_bugs.list::%loop-index%::assigned} is "&e%player%"
send "%{db_bugs.list::%loop-index%::number}%.&a%loop-index%...By:&e%loop-value%&a...%{db_bugs.list::%loop-index%::status}%"
stop

argument 3 is set:
loop {db_bugs.list::*}:
{db_bugs.list::%loop-index%::assigned} is "&e%argument 3%"
send "%{db_bugs.list::%loop-index%::number}%.&a%loop-index%...By:&e%loop-value%&a...%{db_bugs.list::%loop-index%::status}%"




argument 1 is "assign":

argument 2 is not set:
send "&cPlease select a number:&e/buga assign <number>"
stop
argument 3 is not set:
send "&cPlease specify a player! &e/buga assign %argument 2% <player>"
stop
set {_num} to argument 2 parsed as integer
loop {db_bugs.list::*}:
set {_loop.count} to {db_bugs.list::%loop-index%::number}
{_loop.count} is {_num}
set {db_bugs.list::%loop-index%::assigned} to "&e%argument 3%"
send "&aBug Number %argument 2% has been assigned to &e%argument 3%"

argument 1 is "check":

argument 2 is not set:
send "&cPlease specify a bug number:&e/buga <number>"
send "&cCheck bug numbers with &e/buga list"
stop

set {_num} to argument 2 parsed as integer
loop {db_bugs.list::*}:
set {_loop.count} to {db_bugs.list::%loop-index%::number}
{_loop.count} is {_num}
send "&a===================="
send "&e Bug"
send "&e %{_num}%"
send "&a===================="
send " "
send "&eBug:&a%loop-index%"
send " "
send "&eStatus:%{db_bugs.list::%loop-index%::status}% &eAssigned:%{db_bugs.list::%loop-index%::assigned}%"
send " "
send "&eComments:"
loop {db_bugs.list::%loop-index%::comments::*}:
send "%loop-index-2% - %loop-value-2%"
stop

argument 1 is "delete":
player does not have permission "obam.admin":
send "&cOnly admins can delete bugs, please just set status to closed"
stop
argument 2 is not set:
send "&cPlease specify a bug number! &e/buga delete <number>"
stop

set {_num} to argument 2 parsed as integer
loop {db_bugs.list::*}:
set {_loop.count} to {db_bugs.list::%loop-index%::number}
{_loop.count} is {_num}
delete {db_bugs.list::%loop-index%}
send "&cDeleted"
stop

argument 1 is "comment":
argument 2 is not set:
send "&cPlease specify a bug number! &e/buga comment <number> <comment>"
stop
argument 3 is not set:
send "&cPlease specify a comment! &e/buga comment %argument 2% <comment>"
stop

set {_num} to argument 2 parsed as integer
loop {db_bugs.list::*}:
set {_loop.count} to {db_bugs.list::%loop-index%::number}
{_loop.count} is {_num}
set {_size} to size of {db_bugs.list::%loop-index%::comments::*}
{_size} is not set:
set {_size} to 0
add 1 to {_size}
set {_message} to "%{_size}% %argument 3%"
set {db_bugs.list::%loop-index%::comments::%{_message}%} to player
send "&aComment added to bug Number %argument 2%"
stop

argument 1 is "status":
argument 2 is not set:
send "&cPlease specify a bug number! &e/buga status <number> <open|pending|closed>"
stop
argument 3 is not "Open" or "Pending" or "Closed":
send "&cPlease specify a valid status! &e/buga status %argument 2% <open|pending|closed>"
stop

argument 3 is not set:
send "&cPlease specify a status! &e/buga status %argument 2% <open|pending|closed>"
stop

argument 3 is "open":
set {_stat} to "&aOpen"
argument 3 is "pending":
set {_stat} to "&ePending"
argument 3 is "closed":
set {_stat} to "&cClosed"
set {_num} to argument 2 parsed as integer
loop {db_bugs.list::*}:
set {_loop.count} to {db_bugs.list::%loop-index%::number}
{_loop.count} is {_num}
set {db_bugs.list::%loop-index%::status} to {_stat}
send "&aStatus Set"
stop




13 changes: 13 additions & 0 deletions Obam-Testing/modbridge.sk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
command /modpush <text>:
trigger:
forward command "/modcatch %argument%" to console
command /modcatch <text>:
permission: obam.admin
trigger:

wait 1 tick
broadcast "Mod Command"
loop all players:
{db_channel.staff::%loop-player%} is set:

send argument to loop-player
Loading