Daily Merge

OBAM-Voting/prizewheel.sk

@@ -359,16 +359,16 @@ command /prize [<text>] [<text>] [<text>] [<integer>]:
 					stop
 
 				{_ran} is 4:
-					{db_winnings.chest.%player%.fronts::enchanted book of unbreaking 4} is not set:
-						set {db_winnings.chest.%player%.fronts::enchanted book of unbreaking 4} to 1
-						send "&aYou have won &e1 enchanted book of unbreaking 4&a for &eFronts!"
+					{db_winnings.chest.%player%.fronts::diamond pickaxe of unbreaking 4} is not set:
+						set {db_winnings.chest.%player%.fronts::diamond pickaxe of unbreaking 4} to 1
+						send "&aYou have won &e1 diamond pickaxe of unbreaking 4&a for &eFronts!"
 						send "&aUse &e/prize claim&a in Fronts to claim!"
-						log "%player%^ADD^1^enchanted book of unbreaking 4^SEMIRARE PRIZE db_winnings" to "prizewheel/db_winnings.log"
+						log "%player%^ADD^1^diamond pickaxe of unbreaking 4^SEMIRARE PRIZE db_winnings" to "prizewheel/db_winnings.log"
 						stop
-					add 1 to {db_winnings.chest.%player%.fronts::enchanted book of unbreaking 4}
-					send "&aYou have won &e1 enchanted book of unbreaking 4&a for &eFronts!"
+					add 1 to {db_winnings.chest.%player%.fronts::diamond pickaxe of unbreaking 4}
+					send "&aYou have won &e1 diamond pickaxe of unbreaking 4&a for &eFronts!"
 					send "&aUse &e/prize claim&a in Fronts to claim!"
-					log "%player%^ADD^1^enchanted book of unbreaking 4^SEMIRARE PRIZE db_winnings" to "prizewheel/db_winnings.log"
+					log "%player%^ADD^1^diamond pickaxe of unbreaking 4^SEMIRARE PRIZE db_winnings" to "prizewheel/db_winnings.log"
 					stop
 
 			chance of 25%:
@@ -547,16 +547,16 @@ command /prize [<text>] [<text>] [<text>] [<integer>]:
 					stop
 
 				{_ran} is 14:
-					{db_winnings.chest.%player%.fronts::enchanted book of fortune 3} is not set:
-						set {db_winnings.chest.%player%.fronts::enchanted book of fortune 3} to 1
-						send "&aYou have won &e1 enchanted book of fortune 3&a for &eFronts!"
+					{db_winnings.chest.%player%.fronts::diamond pickaxe of fortune 3} is not set:
+						set {db_winnings.chest.%player%.fronts::diamond pickaxe of fortune 3} to 1
+						send "&aYou have won &e1 diamond pickaxe of fortune 3&a for &eFronts!"
 						send "&aUse &e/prize claim&a in Fronts to claim!"
-						log "%player%^ADD^1^enchanted book of fortune 3^UNCOMMON PRIZE db_winnings" to "prizewheel/db_winnings.log"
+						log "%player%^ADD^1^diamond pickaxe of fortune 3^UNCOMMON PRIZE db_winnings" to "prizewheel/db_winnings.log"
 						stop
-					add 1 to {db_winnings.chest.%player%.fronts::enchanted book of fortune 3}
-					send "&aYou have won &e1 enchanted book of fortune 3&a for &eFronts!"
+					add 1 to {db_winnings.chest.%player%.fronts::diamond pickaxe of fortune 3}
+					send "&aYou have won &e1 diamond pickaxe of fortune 3&a for &eFronts!"
 					send "&aUse &e/prize claim&a in Fronts to claim!"
-					log "%player%^ADD^1^enchanted book of fortune 3^UNCOMMON PRIZE db_winnings" to "prizewheel/db_winnings.log"
+					log "%player%^ADD^1^diamond pickaxe of fortune 3^UNCOMMON PRIZE db_winnings" to "prizewheel/db_winnings.log"
 					stop
 
 				{_ran} is 15:
@@ -771,28 +771,28 @@ command /prize [<text>] [<text>] [<text>] [<integer>]:
 				stop
 
 			{_ran} is 8:
-				{db_winnings.chest.%player%.fronts::enchanted book of unbreaking 3} is not set:
-					set {db_winnings.chest.%player%.fronts::enchanted book of unbreaking 3} to 1
-					send "&aYou have won &e1 enchanted book of unbreaking 3&a for &eFronts!"
+				{db_winnings.chest.%player%.fronts::diamond pickaxe of unbreaking 3} is not set:
+					set {db_winnings.chest.%player%.fronts::diamond pickaxe of unbreaking 3} to 1
+					send "&aYou have won &e1 diamond pickaxe of unbreaking 3&a for &eFronts!"
 					send "&aUse &e/prize claim&a in Fronts to claim!"
-					log "%player%^ADD^1^enchanted book of unbreaking 3^COMMON PRIZE db_winnings" to "prizewheel/db_winnings.log"
+					log "%player%^ADD^1^diamond pickaxe of unbreaking 3^COMMON PRIZE db_winnings" to "prizewheel/db_winnings.log"
 					stop
-				add 1 to {db_winnings.chest.%player%.fronts::enchanted book of unbreaking 3}
-				send "&aYou have won &e1 enchanted book of unbreaking 3&a for &eFronts!"
+				add 1 to {db_winnings.chest.%player%.fronts::diamond pickaxe of unbreaking 3}
+				send "&aYou have won &e1 diamond pickaxe of unbreaking 3&a for &eFronts!"
 				send "&aUse &e/prize claim&a in Fronts to claim!"
-				log "%player%^ADD^1^enchanted book of unbreaking 3^COMMON PRIZE db_winnings" to "prizewheel/db_winnings.log"
+				log "%player%^ADD^1^diamond pickaxe of unbreaking 3^COMMON PRIZE db_winnings" to "prizewheel/db_winnings.log"
 
 			{_ran} is 9:
-				{db_winnings.chest.%player%.fronts::enchanted book of silk touch} is not set:
-					set {db_winnings.chest.%player%.fronts::enchanted book of silk touch} to 1
-					send "&aYou have won &e1 enchanted book of silk touch&a for &eFronts!"
+				{db_winnings.chest.%player%.fronts::diamond pickaxe of silk touch} is not set:
+					set {db_winnings.chest.%player%.fronts::diamond pickaxe of silk touch} to 1
+					send "&aYou have won &e1 diamond pickaxe of silk touch&a for &eFronts!"
 					send "&aUse &e/prize claim&a in Fronts to claim!"
-					log "%player%^ADD^1^enchanted book of silk touch^COMMON PRIZE db_winnings" to "prizewheel/db_winnings.log"
+					log "%player%^ADD^1^diamond pickaxe of silk touch^COMMON PRIZE db_winnings" to "prizewheel/db_winnings.log"
 					stop
-				add 1 to {db_winnings.chest.%player%.fronts::enchanted book of silk touch}
-				send "&aYou have won &e1 enchanted book of silk touch&a for &eFronts!"
+				add 1 to {db_winnings.chest.%player%.fronts::diamond pickaxe of silk touch}
+				send "&aYou have won &e1 diamond pickaxe of silk touch&a for &eFronts!"
 				send "&aUse &e/prize claim&a in Fronts to claim!"
-				log "%player%^ADD^1^enchanted book of silk touch^COMMON PRIZE db_winnings" to "prizewheel/db_winnings.log"
+				log "%player%^ADD^1^diamond pickaxe of silk touch^COMMON PRIZE db_winnings" to "prizewheel/db_winnings.log"
 
 			{_ran} is 10:
 				{db_winnings.chest.%player%.fronts::diamond} is not set:
@@ -863,7 +863,7 @@ command /prizefix <text> <text>:
 command /fixbook:
 	permission: obamm.free
 	trigger:
-		player's tool is enchanted book:
+		player's tool is diamond pickaxe:
 			set {_hold} to "%player's tool%"
 			set {_hold} to {_hold} parsed as item
 			send "%{_hold}%"

OBAM-Voting/vote.sk

@@ -20,6 +20,21 @@ command /vote [<text>] [<number>] [<text>]:
 			send "&3&l=========================================="
 			send "&eVote for &6&lOBAM&fCraft &eon the following server lists" 
 			send "&eto earn special prizes and win OBAM Tickets! "
+			{db_votetokens.%{_player}%} is not set:
+				set {_tmp.mes} to "&aYou can get a Prize Token now!"
+			set {_waited} to difference between {db_votetokens.%{_player}%.time} and now
+			{_waited} is more than a day:
+				set {_tmp.mes} to "&aYou can get a Prize Token now!"
+			{_waited} is less than a day:
+				set {_tmp.time} to {_waited}
+				set {_tmp.hold} to difference between now and now
+				add 24 hours to {_tmp.hold}
+				subtract {_tmp.time} from {_tmp.hold}
+				set {_tmp.time} to {_tmp.hold}
+
+				set {_tmp.mes} to "&aYour next Prize Token is available in &e%{_tmp.time}%&a!"
+			send " "
+			send "%{_tmp.mes}%"
 			send " "
 			send "&2&l✔&f - Voted Today  &d|  &c&lX&f - Not Voted Today"
 			send " "
@@ -393,6 +408,44 @@ command /vote [<text>] [<number>] [<text>]:
 			send "&a10.  - %{_vote.check0}% - %{db_obam.vote.link.10}%" to player
 			clear {_message}
 			clear {_waited}
+
+			set {_waited} to difference between now and {db_server.mineserverscom.%{_player}%}
+			clear {time.vote::*}
+			{_waited} is less than 1 day:
+				set {_vote.check0} to "&a[&2&l✔&a]"
+			{_waited} is more than 1 day:
+				set {_vote.check0} to "&a[&c&lX&a]"
+			{_waited} is not set:
+				set {_vote.check0} to "&a[&c&lX&a]"
+				set {_message0} to "Now Availible!"
+			{_waited} is less than 1 day:
+				set {_time} to {db_server.mineservers.%{_player}%}
+				add 1 day to {_time}
+				set {_time} to difference between {_time} and now
+				{_time} is greater than 1 hour:
+					set {_time} to "%{_time}%"
+					clear {time.vote::*}
+					set {time.vote::*} to {_time} parsed as "%number% hour[s] and %integer%.%integer% minute[s]"
+
+					set {_hrs} to {time.vote::1}
+					set {_mins} to {time.vote::2}
+					set {_message0} to "&eVote in &a%{time.vote::1}%h &e& &a%{time.vote::2}%m"
+				{_time} is less than 1 hour:
+					set {_time} to "%{_time}%"
+					clear {time.vote::*}
+					set {time.vote::*} to {_time} parsed as "%number% minute[s] and %integer%.%integer% minute[s]"
+					set {_message0} to "&eVote in &a%{time.vote::1}%m &e& &a%{time.vote::2}%s"
+				{_time} is less than 1 minute:
+					set {_message0} to "&In a few seconds!"
+			{_waited} is more than 1 day:
+				set {_message0} to "Now available!"
+
+			{db_server.mineserverscom.%{_player}%} is not set:
+				set {_vote.check0} to "&a[&c&lX&a]"
+			send "&a11.  - %{_vote.check0}% - %{db_obam.vote.link.11}%" to player
+			clear {_message}
+			clear {_waited}
+
 
 
 		argument 1 is "set" or "s":

OBAM-Voting/votetoken.sk

@@ -40,6 +40,8 @@ command /votetoken [<text>] [<text>]:
 				set {db_server.minecraftmpcom.%argument 1%} to now
 			argument 2 is "minecraftservers":
 				set {db_server.minecraftservers.%argument 1%} to now
+			argument 2 is "mineservers.com":
+				set {db_server.mineserverscom.%argument 1%} to now
 			set {db_votetokens.%argument 1%.time} to now
 			set {db_votetokens.%argument 1%.lserv} to argument 2
 			execute console command "/alert %argument 1% just received their first &ePrize Token!"
@@ -72,7 +74,8 @@ command /votetoken [<text>] [<text>]:
 					set {db_server.minecraftmpcom.%argument 1%} to now
 				argument 2 is "minecraftservers":
 					set {db_server.minecraftservers.%argument 1%} to now
-					set {db_server.mcserverlistcom.%argument 1%} to now
+				argument 2 is "mineservers.com":
+					set {db_server.mineserverscom.%argument 1%} to now
 				execute console command "/alert %argument 1% just received a &ePrize Token&5 by voting on %argument 2%!"
 				log "%argument 1%^VOTETOKEN^ADD^1^SERVICE^%argument 2%" to "vote/TOKENS.log"
 				stop
@@ -103,6 +106,8 @@ command /votetoken [<text>] [<text>]:
 					set {db_server.minecraftmpcom.%argument 1%} to now
 				argument 2 is "minecraftservers":
 					set {db_server.minecraftservers.%argument 1%} to now
+				argument 2 is "mineservers.com":
+					set {db_server.mineserverscom.%argument 1%} to now
 				{_bal} is not set:
 					{offline.%{_player}%.ticketadd} is not set:
 						set {offline.%{_player}%.ticketadd} to 0

Obam-Creative/nightvision.sk

@@ -0,0 +1,9 @@
+
+command /tnight:
+	permission: obam.mod
+	trigger:
+		player has night vision:
+			remove night vision from player
+			stop
+		player does not have night vision:
+			apply night vision to player for 999 days

Obam-General/CreatureCapture.sk

@@ -0,0 +1,153 @@
+# add back in world is "creature_capture":
+options:
+	lasso: stick named "&bLasso" with lore "&eRight click with this to turn mobs into eggs."
+	rod: fishing rod named "&bCapture Rod" with lore "&eUse this rod to capture the mobs."
+
+on rightclick on sign:
+	world is "CreatureCapture"
+	line 1 of block is "Get a":
+		line 2 of block is "Lasso":
+			if player has {@lasso}:
+				send "&cYou already have a lasso" to player
+				stop
+			give player {@lasso}
+			stop
+		line 2 of block is "Capture Rod":
+			if player has {@rod}:
+				send "&cYou already have a capture rod" to player
+				stop
+			give player {@rod}
+			stop
+
+command /ccsign:
+	permission: obam.admin
+	permission message: "&cThis command is only available for Admins."
+	trigger:
+		world is "CreatureCapture"
+		send "&fSigns:" to player
+		send "&fType &agive &fon line 1" to player
+		send "&fType &alasso &for &acapture rod&f on line 2" to player
+		send "&f-----" to player
+
+on sign change:
+	world is "CreatureCapture"
+	line 1 is "give" or "Give":
+		set line 1 to "Get a"
+		set line 3 to "HERE"
+		set line 4 to ""
+	line 2 is "lead" or "Lead" or "Leash" or "leash" or "lasso" or "Lasso":
+		set line 2 to "Lasso"
+		set line 4 to ""
+	line 2 is "rod" or "Rod" or "fishingrod" or "FishingRod" or "fishing rod" or "Fishing Rod" or "capturerod" or "CaptureRod" or "capture rod" or "Capture Rod":
+		set line 2 to "Capture Rod"
+		set line 4 to ""
+
+on right click on entity:
+	world is "CreatureCapture"
+	if player is holding {@lasso}:
+		distance between player and event-entity is smaller than 3
+		if entity is bat:
+			delete entity
+			give player bat spawn egg
+			stop
+		if entity is chicken:
+			delete entity
+			give player chicken spawn egg
+			stop
+		if entity is cow:
+			delete entity
+			give player cow spawn egg
+			stop
+		if entity is horse:
+			delete entity
+			give player horse spawn egg
+			stop
+		if entity is mooshroom:
+			delete entity
+			give player mooshroom spawn egg
+			stop
+		if entity is ocelot:
+			delete entity
+			give player ocelot spawn egg
+			stop
+		if entity is pig:
+			delete entity
+			give player pig spawn egg
+			stop
+		if entity is sheep:
+			delete entity
+			give player sheep spawn egg
+			stop
+		if entity is squid:
+			delete entity
+			give player squid spawn egg
+			stop
+		if entity is villager:
+			delete entity
+			give player villager spawn egg
+			stop
+		if entity is wolf:
+			delete entity
+			give player wolf spawn egg
+			stop
+		if entity is zombie pigman:
+			delete entity
+			give player zombie pigman spawn egg
+			stop
+		if entity is blaze:
+			delete entity
+			give player blaze spawn egg
+			stop
+		if entity is cave spider:
+			delete entity
+			give player cave spider spawn egg
+			stop
+		if entity is creeper:
+			delete entity
+			give player creeper spawn egg
+			stop
+		if entity is enderman:
+			delete entity
+			give player enderman spawn egg
+			stop
+		if entity is ghast:
+			delete entity
+			give player ghast spawn egg
+			stop
+		if entity is magma cube:
+			delete entity
+			give player magma cube spawn egg
+			stop
+		if entity is silverfish:
+			delete entity
+			give player silverfish spawn egg
+			stop
+		if entity is skeleton:
+			delete entity
+			give player skeleton spawn egg
+			stop
+		if entity is slime:
+			delete entity
+			give player slime spawn egg
+			stop
+		if entity is spider:
+			delete entity
+			give player spider spawn egg
+			stop
+		if entity is witch:
+			delete entity
+			give player witch spawn egg
+			stop
+		if entity is zombie:
+			delete entity
+			give player zombie spawn egg
+			stop
+
+on drop:
+	world is "CreatureCapture"
+	event-item is not spawn egg
+	cancel event
+
+on pickup:
+	world is "CreatureCapture"
+	cancel event