Skip to content

Commit 17d51a1

Browse files
ismoochismooch
committed
added some things
-pinfo --@cFerg 's now live version of pinfo with fixes -wtfronts -- if you die with less than 25, will be boosted to 25 @jrlizard -- malaria in swamps (1 in 5 chance every 3 seconds) @jrlizard -disenchant --disenchant added to Fronts @jrlizard -heal -- heal added to abstaining members on fronts @jrlizard
1 parent 0a1abfd commit 17d51a1

File tree

4 files changed

+145
-23
lines changed

4 files changed

+145
-23
lines changed

‎Obam-General/pinfo.sk

+60-21
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,38 @@
11
variables:
2-
{db_dayadd} = 1
2+
{db_dayset.2} = 0
33

44
on join:
5-
{db_count.start.%player%} is not set:
6-
set {db_count.start.%player%} to {db_dayadd}
5+
{db_count.start.%player%.2} is not set:
6+
set {db_count.start.%player%.2} to {db_dayset}
7+
set {db_current.server.%player%} to "&eWTF"
78

9+
on disconnect:
10+
clear {db_current.server.%player%}
11+
set {db_lastseen.%player%} to "%now% on &eWTF"
12+
clear {db_color.%player%}
13+
player has permission "obam.admin":
14+
set {db_color.%player%} to "&d%player%"
15+
{db_color.%player%} is not set:
16+
player has permission "obam.mod":
17+
set {db_color.%player%} to "&2%player%"
18+
{db_color.%player%} is not set:
19+
player has permission "obam.ultimate":
20+
set {db_color.%player%} to "&6%player%"
21+
{db_color.%player%} is not set:
22+
player has permission "obam.supporter":
23+
set {db_color.%player%} to "&b%player%"
24+
{db_color.%player%} is not set:
25+
set {db_color.%player%} to "&f%player%"
26+
27+
828

9-
every 24 hours:
10-
{db_dayadd} = {db_dayadd} + 1
1129

1230
command /playerinfo [<offline player>]:
1331
description: Find out information about you
14-
aliases: /p, /info, /player
32+
aliases: /p, /info, /player, /pinfo
1533
executable by: players
1634
trigger:
35+
1736
argument is not set:
1837
player has permission "obam.admin":
1938
set {_name} to "&d%player%"
@@ -28,14 +47,21 @@ command /playerinfo [<offline player>]:
2847
set {_name} to "&b%player%"
2948
{_name} is not set:
3049
set {_name} to "&f%player%"
31-
message "&aPlayer: %{_name}%"
32-
set {_days} to {db_dayadd} - {db_count.start.%player%}
33-
set {_days} to {_days} + 1
50+
message "&aPlayer:<reset> %{_name}%"
51+
set {_days} to {db_dayset} - {db_count.start.%player%}
3452
{_days} is less than 2:
35-
message "&aThey are &e%{_days}% &aday old."
36-
stop
53+
{_days} is 1:
54+
message "&aYou are &e%{_days}% &aday old."
55+
stop
56+
{_days} is less than 1:
57+
message "&aThis is your first day."
58+
stop
3759
message "&aYou are &e%{_days}% &adays old."
3860
argument is set:
61+
argument has not played before:
62+
message "&e%argument% &chas not played on this server before."
63+
stop
64+
3965
argument has permission "obam.admin":
4066
set {_name} to "&d%argument%"
4167
{_name} is not set:
@@ -46,18 +72,31 @@ command /playerinfo [<offline player>]:
4672
set {_name} to "&6%argument%"
4773
{_name} is not set:
4874
argument has permission "obam.supporter":
49-
set {_name} to "&b%argument%"
75+
set {_name} to "&&b%argument%"
5076
{_name} is not set:
5177
set {_name} to "&f%argument%"
5278
argument is not online:
53-
set {_name} to "&7%argument% &7&o(Offline)"
79+
{db_current.server.%argument%} is not set:
80+
set {_name} to "&7%argument% &7&o(Offline)"
81+
{db_color.%argument%} is set:
82+
set {_name} to {db_color.%argument%}
83+
set {_lastseen} to "&aLast seen:&e%{db_lastseen.%argument%}%"
84+
{db_current.server.%argument%} is set:
85+
{db_color.%argument%} is set:
86+
set {_name} to {db_color.%argument%}
87+
set {_current.connect} to "&aCurrently connected to %{db_current.server.%argument%}%"
88+
5489
message "&aPlayer:<reset> %{_name}%"
55-
set {_days} to {db_dayadd} - {db_count.start.%argument%}
56-
set {_days} to {_days} + 1
90+
{_lastseen} is set:
91+
send {_lastseen}
92+
{_current.connect} is set:
93+
send {_current.connect}
94+
set {_days} to {db_dayset} - {db_count.start.%argument%}
5795
{_days} is less than 2:
58-
message "&aThey are &e%{_days}% &aday old."
59-
stop
60-
message "&aThey are &e%{_days}% &adays old."
61-
62-
63-
96+
{_days} is 1:
97+
message "&aThey are &e%{_days}% &aday old."
98+
stop
99+
{_days} is less than 1:
100+
message "%{_name}% &ais &e1&a day old"
101+
stop
102+
message "&aThey are &e%{_days}% &adays old."

‎Obam-Survival/disenchant.sk

+28
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
command /unenchant:
2+
executable by: players
3+
permission: obam.free
4+
aliases: /disenchant
5+
trigger:
6+
player's tool is not a sword or axe or pickaxe or shovel or bow or helmet or chestplate or leggings or boots:
7+
message "&cYou may only disenchant Armour, Weapons or Tools!" to player
8+
stop
9+
10+
11+
set {_bal} to player's balance
12+
{_bal} is less than 200:
13+
send "&cYou do not have enough tickets to do this!" to player
14+
stop
15+
player's level is less than 15:
16+
17+
send "&cYou must have at least 15 levels to do this!" to player
18+
stop
19+
disenchant player's tool
20+
21+
reduce the player's level by 15
22+
23+
remove 200 from player's balance
24+
send "&6&lThe Gods have taken their gifts back!" to player
25+
send "&aYou have used &e200 Tickets&a to disenchant this tool" to player
26+
send "&aYou have &e%player's balance%&a remaining" to player
27+
log "%player%^%{_bal}%^DEDUCT^200^%player's balance%^DISENCHANT FEE" to "tickets/disenchant.log"
28+
stop

‎Obam-Survival/heal.sk

+43
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
variables:
2+
{heal.%player%} = false
3+
4+
5+
6+
7+
8+
9+
command /heal:
10+
executable by: players
11+
permission: obam.free
12+
trigger:
13+
{heal.%player%} is not set:
14+
set {heal.%player%} to now
15+
add 13 hours to {heal.%player%}
16+
17+
set {_check} to difference between {heal.%player%} and now
18+
{_check} is less than 12 hours:
19+
set {_check} to difference between {heal.%player%} and now
20+
set {_hold} to difference between now and now
21+
add 12 hours to {_hold}
22+
subtract {_check} from {_hold}
23+
send "&cYou must wait at least &e%{_hold}% &cto use this command!"
24+
stop
25+
{abstain.%player%} is false:
26+
send "&cOnly abstaining players can use this feature!"
27+
stop
28+
{abstian.%player%} is "wait pvp" or "wait abstain":
29+
send "&cYou can not use this feature in transition!"
30+
stop
31+
{abstain.%player%} is true:
32+
33+
set {_bal} to player's balance
34+
{_bal} is less than 2000:
35+
send "&cYou do not have enough tickets to do this!" to player
36+
stop
37+
38+
remove 2000 from player's balance
39+
set {heal.%player%} to now
40+
send "&aYou have been healed" to player
41+
set player's health to 10
42+
send "&aYou have &e%player's balance%&a remaining" to player
43+
stop

‎Obam-Testing/wtfronts.sk

+14-2
Original file line numberDiff line numberDiff line change
@@ -245,6 +245,13 @@ every 3 seconds:
245245
chance of 45%:
246246
damage loop-player by 2
247247
send "&cThe sun beats down on you" to loop-player
248+
249+
biome at loop-player is swamp:
250+
set {_ran} to a random integer between 1 and 5
251+
{_ran} is 1:
252+
apply hunger 2 to loop-player for 20 seconds
253+
send "&cMalaria runs through your body" to loop-player
254+
248255

249256
y-coordinate of loop-player is greater than 110:
250257
loop-player's helmet is air
@@ -285,7 +292,12 @@ every 3 seconds:
285292
set loop-player's hunger level to 10
286293
remove named item stack from "{@elefuel}" from loop-player
287294

288-
295+
296+
297+
298+
299+
300+
289301
loop all entities:
290302
loop-entity is not player:
291303
{unstable.%loop-entity%} is set:
@@ -433,7 +445,7 @@ on consume of water bottle:
433445
set {thirst.%player%} to 100
434446

435447
on death of a player:
436-
{thirst.%player%} is 0:
448+
{thirst.%player%} is less than 25:
437449
set {thirst.%player%} to 25
438450

439451
command /ci [<number>]:

0 commit comments

Comments
 (0)