Skip to content

Commit 637eb03

Browse files
plvxtplvxt
committed
Actualización 3.0.1
1 parent 75e507e commit 637eb03

File tree

6 files changed

+63
-66
lines changed

6 files changed

+63
-66
lines changed

‎resources/config.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
server_name: "&l&bTu&fServer" # Soporte para coloreado con & (no uses § o no funcionará).
1010
map_number: "1" # Sólo números, sin letras.
1111
URL: "https://discord.com/api/webhooks/" # Ingresa tu webhook para anunciar KOTH's y otras cosas.
12+
store: "" # Tienda del servidor.
1213

1314
# --------------------------------------------------------
1415
# 🢃 Menú de kits inicia aquí 🢃

‎resources/scoreboard_settings.yml‎

Lines changed: 30 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -11,34 +11,35 @@
1111

1212
server_ip: "jugar.tuip.com"
1313
scoreb_lines: "" # Separador para la scoreboard (recomendado 15 líneas)
14-
StormBreaker: "&b&lStormBreaker&8» &r&7{time} "
15-
AntiTrapper: "&b&lAntiTrapper&8» &r&7{time} "
16-
Bard: "&b&lZombieBard&8» &r&7{time} "
17-
RogueItem: "&b&lRogue Sword&8» &r&7{time} "
18-
Berserk: "&b&lBerserk&8» &r&7{time} "
19-
EggPort: "&b&lEggPort&8» &r&7{time} "
20-
SpecialItem: "&l&bPartner Item&8» &r&7{time} "
21-
NinjaShear: "&l&bNinjaShear&8» &r&7{time} "
22-
PotionCounter: "&l&bPotionCounter&8» &r&7{time} "
23-
EnderPearl: "&b&lEnderPearl&8» &r&7{time} "
24-
CombatTag: "&b&lCombatTag&8» &r&7{time} "
25-
Apple: "&b&lApple&8» &r&7{time} "
26-
Logout: "&b&lLogout&8» &r&7{time} "
27-
Home: "&b&lHome&8» &r&7{time} "
28-
Stuck: "&b&lStuck&8» &r&7{time} "
29-
SOTW: "&b&lSOTW&8» &r&7{time} "
30-
EOTW: "&b&lEOTW&8» &r&7{time} "
31-
KOTH: "&l&b{kothName}&8» &r&7{time} "
32-
SALE: "&b&lRestart&8» &r&7{time}"
33-
PP: "&l&bPP All in&8» &r&7{time} "
34-
Airdrop: "&l&bAirdrop all in&8» &r&7{time} "
35-
Invincibility: "&b&lPvP Timer&8» &r&7{time} "
36-
BardEnergy: "&b&lBardEnergy&8» &r&c{bardEnergy} "
37-
ArcherEnergy: "&b&lArcherEnergy&8» &r&c{archerEnergy} "
38-
MageEnergy: "&b&lMageEnergy&8» &r&c{mageEnergy} "
14+
hq_service: " §9HQ§8:"
15+
StormBreaker: " &eStormBreaker&8: &r&f{time} "
16+
AntiTrapper: " &eAntiTrapper&8: &r&f{time} "
17+
Bard: " &eZombieBard&8: &r&f{time} "
18+
RogueItem: " &eRogue Sword&8: &r&f{time} "
19+
Berserk: " &eBerserk&8: &r&f{time} "
20+
EggPort: " &eEggPort&8: &r&f{time} "
21+
SpecialItem: " &ePartner Item&8: &r&f{time} "
22+
NinjaShear: " &eNinjaShear&8: &r&f{time} "
23+
PotionCounter: " &ePotionCounter&8: &r&f{time} "
24+
EnderPearl: " &eEnderPearl&8: &r&f{time} "
25+
CombatTag: " &eCombatTag&8: &r&f{time} "
26+
Apple: " &6Apple&8: &r&f{time} "
27+
Logout: " &6Logout&8: &r&f{time} "
28+
Home: " &6Home&8: &r&f{time} "
29+
Stuck: " &6Stuck&8: &r&f{time} "
30+
SOTW: " &aSOTW&8: &r&f{time} "
31+
EOTW: " &cEOTW&8: &r&f{time} "
32+
KOTH: " &4{kothName}&8: &r&f{time} "
33+
SALE: " &dRestart&8: &r&f{time}"
34+
PP: " &dPP All in&8: &r&f{time} "
35+
Airdrop: " &dAirdrop all in&8: &r&f{time} "
36+
Invincibility: " &2PvP Timer&8: &r&f{time} "
37+
BardEnergy: " &5BardEnergy&8: &r&c{bardEnergy} "
38+
ArcherEnergy: " &5ArcherEnergy&8: &r&c{archerEnergy} "
39+
MageEnergy: " &5MageEnergy&8: &r&c{mageEnergy} "
3940
factionFocus: [
40-
"&l&bFaction&8» &r&7{factionName} ",
41-
"&l&bFocus HQ&8» &r&7{factionHome} ",
42-
"&l&bDTR&8» &r&7{factionDTR} ",
43-
"&l&bOnline&8» &r&7{factionOnlinePlayers} ",
41+
" &bFaction&8: &r&f{factionName} ",
42+
" &bFocus HQ&8: &r&f{factionHome} ",
43+
" &bDTR&8: &r&f{factionDTR} ",
44+
" &bOnline&8: &r&f{factionOnlinePlayers} ",
4445
]

‎src/alkaedaav/Factions.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -814,7 +814,7 @@ public static function getTopFactions(){
814814
$data = SQLite3Provider::getDataBase();
815815
$result = $data->query("SELECT * FROM points ORDER BY points DESC LIMIT 10;");
816816
$count = 1;
817-
$text = "§b§lTop Factions - §9HCF§r\n";
817+
$text = "§l§cPremio a Top 1: §f$5 USD §9Pay§bPal\n\n§r§6Top Factions:\n";
818818

819819
while($resultArr = $result->fetchArray(SQLITE3_ASSOC)) {
820820
$name = $resultArr["factionName"];

‎src/alkaedaav/Task/Scoreboard.php‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -123,12 +123,12 @@ public function onRun(Int $currentTick) : void {
123123
}
124124
$claim = TE::RED.$player->getRegion();
125125
if($player->getRegion() === Factions::getFaction($player->getName())){
126-
$claim = TE::WHITE.$player->getRegion();
126+
$claim = TE::LIGHT_PURPLE.$player->getRegion();
127127
}
128128
if($player->getRegion() === "Spawn"){
129-
$claim = TE::WHITE.$player->getRegion();
129+
$claim = TE::LIGHT_PURPLE.$player->getRegion();
130130
}
131-
$scoreboard[] = TE::DARK_AQUA.TE::BOLD."HQ".TE::DARK_GRAY."» ".$claim;
131+
$scoreboard[] = $config->get("hq_service") . $claim;
132132

133133
if($player->isFocus()){
134134
if(!Factions::isFactionExists($player->getFocusFaction())) $player->setFocus(false);
@@ -137,10 +137,11 @@ public function onRun(Int $currentTick) : void {
137137
}
138138
}
139139
if(count($scoreboard) >= 1){
140-
$scoreboard[] = TE::GRAY. $config->get("scoreb_lines");
140+
$scoreboard[] = TE::GRAY. " ";
141141
$texting = [TE::GRAY.TE::GRAY. $config->get("scoreb_lines") . TE::RESET];
142-
$network = [TE::DARK_AQUA.TE::BOLD. "Web" . TE::DARK_GRAY . "» " . TE::RESET . TE::GRAY . $config->get("server_ip") . TE::RESET];
143-
$scoreboard = array_merge($texting, $network, $scoreboard);
142+
$network = [TE::GRAY . $config->get("scoreb_lines") . TE::RESET];
143+
$acme = [TE::GRAY . " " . $config->get("server_ip") . TE::RESET];
144+
$scoreboard = array_merge($texting, $scoreboard, $acme, $network);
144145
}else{
145146
$api->removePrimary($player);
146147
return;
@@ -158,4 +159,4 @@ public function onRun(Int $currentTick) : void {
158159
}
159160
}
160161

161-
?>
162+
?>

‎src/alkaedaav/commands/ReclaimCommand.php‎

Lines changed: 22 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,11 @@ public function execute(CommandSender $sender, String $label, Array $args) : voi
3636
try {
3737
$sender->resetReclaimTime();
3838

39-
CrateManager::giveKey($sender, "Ordinary", 20);
40-
CrateManager::giveKey($sender, "Strange", 17);
41-
CrateManager::giveKey($sender, "Moon", 15);
42-
CrateManager::giveKey($sender, "HCF", 12);
43-
CrateManager::giveKey($sender, "Ability", 12);
44-
CrateManager::giveKey($sender, "Alexpolu", 12);
45-
39+
CrateManager::giveKey($sender, "starter", 30);
40+
CrateManager::giveKey($sender, "bolt", 16);
41+
CrateManager::giveKey($sender, "cosmica", 8);
42+
CrateManager::giveKey($sender, "partner", 10);
43+
CrateManager::giveKey($sender, "suerte", 3);
4644
#$sender->sendMessage("recla ddadl");
4745
$sender->resetReclaimTime();
4846
Loader::getInstance()->getServer()->broadcastMessage(str_replace(["&", "{playerName}"], ["§", $sender->getName()], Loader::getConfiguration("messages")->get("player_reclaim_correctly")));
@@ -53,16 +51,15 @@ public function execute(CommandSender $sender, String $label, Array $args) : voi
5351
$sender->sendMessage(str_replace(["&", "{time}"], ["§", Time::getTime($sender->getTimeReclaimRemaining())], Loader::getConfiguration("messages")->get("function_cooldown")));
5452
}
5553
}
56-
if($sender->hasPermission("partner.reclaim")){
54+
if($sender->hasPermission("vip.reclaim")){
5755
if($sender->getTimeReclaimRemaining() < time()){
5856
try {
5957
$sender->resetReclaimTime();
60-
CrateManager::giveKey($sender, "Ordinary", 20);
61-
CrateManager::giveKey($sender, "Strange", 17);
62-
CrateManager::giveKey($sender, "Moon", 15);
63-
CrateManager::giveKey($sender, "HCF", 12);
64-
CrateManager::giveKey($sender, "Ability", 12);
65-
CrateManager::giveKey($sender, "Alexpolu", 12);
58+
CrateManager::giveKey($sender, "starter", 15);
59+
CrateManager::giveKey($sender, "bolt", 8);
60+
CrateManager::giveKey($sender, "cosmica", 4);
61+
CrateManager::giveKey($sender, "partner", 5);
62+
CrateManager::giveKey($sender, "suerte", 2);
6663
$sender->resetReclaimTime();
6764
Loader::getInstance()->getServer()->broadcastMessage(str_replace(["&", "{playerName}"], ["§", $sender->getName()], Loader::getConfiguration("messages")->get("player_reclaim_correctly")));
6865
} catch(\Exception $exception){
@@ -77,12 +74,11 @@ public function execute(CommandSender $sender, String $label, Array $args) : voi
7774
if($sender->getTimeReclaimRemaining() < time()){
7875
try {
7976
$sender->resetReclaimTime();
80-
CrateManager::giveKey($sender, "Demonic", 6);
81-
CrateManager::giveKey($sender, "Ultra", 10);
82-
CrateManager::giveKey($sender, "Alexpolu", 4);
83-
#CrateManager::giveKey($sender, "Thureland", 4);
84-
CrateManager::giveKey($sender, "Aurora", 6);
85-
CrateManager::giveKey($sender, "Ability", 4);
77+
CrateManager::giveKey($sender, "starter", 8);
78+
CrateManager::giveKey($sender, "bolt", 4);
79+
CrateManager::giveKey($sender, "cosmica", 2);
80+
CrateManager::giveKey($sender, "partner", 3);
81+
CrateManager::giveKey($sender, "suerte", 1);
8682
$sender->resetReclaimTime();
8783
Loader::getInstance()->getServer()->broadcastMessage(str_replace(["&", "{playerName}"], ["§", $sender->getName()], Loader::getConfiguration("messages")->get("user_reclaim")));
8884
} catch(\Exception $exception){
@@ -93,16 +89,15 @@ public function execute(CommandSender $sender, String $label, Array $args) : voi
9389
$sender->sendMessage(str_replace(["&", "{time}"], ["§", Time::getTime($sender->getTimeReclaimRemaining())], Loader::getConfiguration("messages")->get("function_cooldown")));
9490
}
9591
}
96-
if($sender->hasPermission("HCF.reclaim")){
92+
if($sender->hasPermission("ultra.reclaim")){
9793
if($sender->getTimeReclaimRemaining() < time()){
9894
try {
9995
$sender->resetReclaimTime();
100-
CrateManager::giveKey($sender, "Ordinary", 20);
101-
CrateManager::giveKey($sender, "Strange", 17);
102-
CrateManager::giveKey($sender, "Moon", 15);
103-
CrateManager::giveKey($sender, "HCF", 12);
104-
CrateManager::giveKey($sender, "Ability", 12);
105-
CrateManager::giveKey($sender, "Alexpolu", 12);
96+
CrateManager::giveKey($sender, "starter", 30);
97+
CrateManager::giveKey($sender, "bolt", 16);
98+
CrateManager::giveKey($sender, "cosmica", 8);
99+
CrateManager::giveKey($sender, "partner", 10);
100+
CrateManager::giveKey($sender, "suerte", 3);
106101
$sender->resetReclaimTime();
107102
Loader::getInstance()->getServer()->broadcastMessage(str_replace(["&", "{playerName}"], ["§", $sender->getName()], Loader::getConfiguration("messages")->get("player_reclaim_correctly")));
108103
} catch(\Exception $exception){

‎src/alkaedaav/crate/Crate.php‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ public function __construct(String $name, Array $items, String $block, String $k
5757
$this->key = $key;
5858
$this->keyName = $keyName;
5959
$this->nameFormat = $nameFormat;
60-
6160
$this->data["block"][$block] = $name;
6261
$this->data["key"][$key] = $name;
6362

@@ -208,7 +207,7 @@ public function updateTag() : bool {
208207
return false;
209208
}
210209
$position = new Vector3($this->getPosition()[0] + 0.5, $this->getPosition()[1] + 1, $this->getPosition()[2] + 0.5);
211-
$this->setParticles(new FloatingTextParticle($position, "", $this->getNameFormat()."\n".TE::WHITE."Tap with the indicated key to get the rewards"));
210+
$this->setParticles(new FloatingTextParticle($position, "", $this->getNameFormat()."\n".TE::DARK_GRAY."-*-\n".TE::WHITE."Toca para abrir\n".TE::AQUA."buy.sandia.vip"));
212211
foreach(Loader::getInstance()->getServer()->getOnlinePlayers() as $player){
213212
$this->addParticles($player);
214213
}

0 commit comments

Comments
 (0)