Skip to content

Daily Merge #15

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
Mar 31, 2014
Merged

Daily Merge #15

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
65144b3
Merge pull request #24 from ob1bob69/master
ismooch Mar 30, 2014
1ad03dc
update prizewheel.sk
ismooch Mar 31, 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
19 changes: 4 additions & 15 deletions OBAM-Voting/prizewheel.sk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ command /prize [<text>] [<text>] [<text>]:


chance of 5%:
set {_ran} to a random integer between 1 and 5
set {_ran} to a random integer between 1 and 4

{_ran} is 1:
set {_bal} to player's balance
Expand All @@ -250,20 +250,9 @@ command /prize [<text>] [<text>] [<text>]:
log "%player%^ADD^1 diamond pickaxe^RARE PRIZE db_winnings" to "prizewheel/db_winnings.log"
stop

{_ran} is 3:
{db_winnings.chest.%player%.fronts::Skeleton Projeggtiles} is not set:
set {db_winnings.chest.%player%.fronts::Skeleton Projeggtiles} to 8
send "&aYou have won &e8 Skeleton Projeggtiles&a on &eFronts&a."
send "&aUse &e/prize claim&a in Fronts to claim!"
log "%player%^ADD^8^Skeleton Projeggtiles^RARE PRIZE db_winnings" to "prizewheel/db_winnings.log"
stop
add 8 to {db_winnings.chest.%player%.fronts::Skeleton Projeggtiles}
send "&aYou have won &e8 Skeleton Projeggtiles&a on &eFronts&a."
send "&aUse &e/prize claim&a in Fronts to claim!"
log "%player%^ADD^8^Skeleton Projeggtiles^RARE PRIZE db_winnings" to "prizewheel/db_winnings.log"
stop


{_ran} is 4:
{_ran} is 3:
{db_winnings.chest.%player%.skyblock::beacon} is not set:
set {db_winnings.chest.%player%.skyblock::beacon} to 1
send "&aYou have won &e1 beacon&a for &eSkyblock!"
Expand All @@ -276,7 +265,7 @@ command /prize [<text>] [<text>] [<text>]:
log "%player%^ADD^1 beacon^RARE PRIZE db_winnings" to "prizewheel/db_winnings.log"
stop

{_ran} is 5:
{_ran} is 4:
{db_prizecheck.%player%} is not set:
set {db_prizecheck.%player%} to 1
send "&aYou have been given &e1 Front Slot&a!"
Expand Down