mloeschenkohl 2 年之前
父節點
當前提交
82be92b02d
共有 5 個文件被更改,包括 79 次插入63 次删除
  1. 1 0
      minigames/rebuild/rebuild.txt
  2. 14 3
      story/admont/neue_hose.txt
  3. 55 59
      system/commands.txt
  4. 0 0
      system/vote.txt
  5. 9 1
      utils/u_general.txt

+ 1 - 0
minigames/rebuild/rebuild.txt

@@ -162,6 +162,7 @@ player_uuid = player.getUuid(player);
 list = map.get(buildingarea, player_uuid);
 if(!list.contains(list, block_loc)) {
 	cancel = true;
+	goto("checkgame");
 }
 cancel = false;
 list.add(check_list, player_uuid);

+ 14 - 3
story/admont/neue_hose.txt

@@ -2,6 +2,7 @@ event.load("quest_start");
 event.load("quest_term");
 event.load("entity_click");
 event.load("player_loom_finish");
+event.load("item_air_click");
 
 stage = 0;
 all_stages = 7;
@@ -42,7 +43,7 @@ if(event == "quest_start") {
 label = concat("stage", text.number(stage));
 goto(label);
 
-@stage0
+//@stage0
 if(event == "entity_click" && hand == "MAIN_HAND" && entity.getType(entity) == "human") {
 	entity_name = entity.getName(entity);
 	if(entity_name == "Rolf") {
@@ -125,12 +126,22 @@ if(event == "entity_click" && hand == "MAIN_HAND" && entity.getType(entity) == "
 }
 goto("wait");
 
-@stage6
+@stage0
+if(event == "item_air_click") {
+	item = living.getEquip(player, "hand");
+	item_type = item.getType(item);
+	if(item_type == "minecraft:leather_leggings") {
+		cancel = true;
+		inv.update(player);
+	}
+	goto("wait");
+}
 if(event == "entity_click" && hand == "MAIN_HAND" && entity.getType(entity) == "human") {
 	entity_name = entity.getName(entity);
-	if(entity_name == "Seppel") {
+	if(entity_name == "Peter") {
 		rest_amount = human.giveItem(entity_name, player, "minecraft:leather_leggings", 1);
 		if(rest_amount == 0) {
+			inv.update(player);
 			msg.prefix(player, "§dPeter", "Vielen Dank!");
 			money.addBoost(player, 12);
 			msg(player, "§dQuest abgeschlossen. Belohnung: 12 Snuvis!");

+ 55 - 59
system/commands.txt

@@ -133,7 +133,7 @@ command.register("unmute", "Unmutes a player");
 command.register("user", "Returns infos about a user");
 command.register("vanish", "Vanishes a player");
 command.register("var", "Reads variables from a scripts");
-//command.register("vote", "Show vote rewars");
+command.register("vote", "Show vote rewars");
 command.register("voxel", "Set radius for voxel");
 command.register("warn", "Warns a player");
 command.register("warp", "Warp-Commands");
@@ -181,6 +181,7 @@ prefix_tips = "§eTips";
 prefix_lock = "§eLock";
 prefix_hawkeye = "§cHawkeye";
 prefix_commands = "§6Commands";
+prefix_vote = "§dVote";
 prefix_friends = "§5Friends";
 prefix_world = "§bWorld";
 prefix_jail = "§5Jail";
@@ -303,56 +304,31 @@ set.add(butcher_set, "zombified_piglin");
 
 rank_array = array.new(25, 2);
 //Playtime
-rank_array[0, 0] = "rank.owner";
-rank_array[0, 1] = "4Owner";
-rank_array[1, 0] = "rank.admin";
-rank_array[1, 1] = "cAdmin";
-rank_array[2, 0] = "rank.moderator";
-rank_array[2, 1] = "9Moderator";
-rank_array[3, 0] = "rank.supporter";
-rank_array[3, 1] = "bSupporter";
-rank_array[4, 0] = "rank.dev";
-rank_array[4, 1] = "5Developer";
-rank_array[5, 0] = "rank.builder";
-rank_array[5, 1] = "5Builder";
-rank_array[6, 0] = "rank.vip";
-rank_array[6, 1] = "dVIP";
-rank_array[7, 0] = "rank.influencer";
-rank_array[7, 1] = "dInfluencer";
-rank_array[8, 0] = "rank.sponsor";
-rank_array[8, 1] = "dSponsor";
-rank_array[9, 0] = "rank.legend";
-rank_array[9, 1] = "2Legend";
-rank_array[10, 0] = "rank.pioneer";
-rank_array[10, 1] = "2Pioneer";
-rank_array[11, 0] = "rank.lord";
-rank_array[11, 1] = "2Lord";
-rank_array[12, 0] = "rank.altruist";
-rank_array[12, 1] = "2Altruist";
-rank_array[13, 0] = "major";
-rank_array[13, 1] = "2Major";
-rank_array[14, 0] = "rank.frequenter";
-rank_array[14, 1] = "6Frequenter";
-rank_array[15, 0] = "rank.explorer";
-rank_array[15, 1] = "6Explorer";
-rank_array[16, 0] = "rank.chief";
-rank_array[16, 1] = "6Chief";
-rank_array[17, 0] = "rank.friend";
-rank_array[17, 1] = "6Friend";
-rank_array[18, 0] = "rank.colonizer";
-rank_array[18, 1] = "6Colonizer";
-rank_array[19, 0] = "rank.newcomer";
-rank_array[19, 1] = "eNewcomer";
-rank_array[20, 0] = "rank.adventurer";
-rank_array[20, 1] = "eAdventurer";
-rank_array[21, 0] = "rank.commander";
-rank_array[21, 1] = "eCommander";
-rank_array[22, 0] = "rank.volunteer";
-rank_array[22, 1] = "eVolunteer";
-rank_array[23, 0] = "rank.settler";
-rank_array[23, 1] = "eSettler";
-rank_array[24, 0] = "rank.user";
-rank_array[24, 1] = "3User";
+rank.add(0, "rank.owner", "4Owner");
+rank.add(1, "rank.admin", "cAdmin");
+rank.add(2, "rank.moderator", "9Moderator");
+rank.add(3, "rank.supporter", "bSupporter");
+rank.add(4, "rank.dev", "5Developer");
+rank.add(5, "rank.builder", "5Builder");
+rank.add(6, "rank.vip", "dVIP");
+rank.add(7, "rank.influencer", "dInfluencer");
+rank.add(8, "rank.sponsor", "dSponsor");
+rank.add(9, "rank.legend", "2Legend");
+rank.add(10, "rank.pioneer", "2Pioneer");
+rank.add(11, "rank.lord", "2Lord");
+rank.add(12, "rank.altruist", "2Altruist");
+rank.add(13, "rank.major", "2Major");
+rank.add(14, "rank.frequenter", "6Frequenter");
+rank.add(15, "rank.explorer", "6Explorer");
+rank.add(16, "rank.chief", "6Chief");
+rank.add(17, "rank.friend", "6Friend");
+rank.add(18, "rank.colonizer", "6Colonizer");
+rank.add(19, "rank.newcomer", "eNewcomer");
+rank.add(20, "rank.adventurer", "eAdventurer");
+rank.add(21, "rank.commander", "eCommander");
+rank.add(22, "rank.volunteer", "eVolunteer");
+rank.add(23, "rank.settler", "eSettler");
+rank.add(24, "rank.user", "3User");
 setScriptVar("ranks", rank_array);
 
 month_array = array.new(12, 2);
@@ -389,7 +365,7 @@ inv.setItem(skip_night_inv, 2, read.item("km:cross_red", 1, "§fNo"));
 skip_night_inv_id = inv.getId(skip_night_inv);
 
 vote_inv = inv.new("222222222");
-inv.setItem(vote_inv, 0, read.item("km:coin_gold", 1, "§fMoneyBooster", "Doubles incoming money for 5 minutes.", "Cost: 30 VP"));
+inv.setItem(vote_inv, 0, read.item("km:coin_gold", 1, "§fMoneyBooster", "Doubles incoming money for 10 minutes.", "Cost: 6 VP"));
 vote_inv_id = inv.getId(vote_inv);
 
 ha_tool = read.item("km:guild_block", 1, "§cHawkeye Tool", "Hawkeye Tool");
@@ -438,6 +414,7 @@ event.load("custom_command");
 event.load("block_click");
 event.load("player_logout");
 event.load("player_data_tick");
+event.load("vote");
 
 msg("dev", "§bCommands §rloaded.");
 @wait
@@ -475,6 +452,20 @@ if(event == "custom_command") {
 	ignoreGoto(command);
 	goto("wait");
 }
+if(event == "vote") {
+	p_uuid = player.getUuid(name);
+	if(p_uuid != null) {
+		p_id = player.getId(p_uuid);
+		player.addVotePoints(p_id, 1);
+		msg.prefix("online", prefix_vote, concat("§b", name, "§r hat gerade gevoted!"));
+		if(from == "minecraft-server.eu") {
+			msg("online", "[", prefix_vote, "§r] " , text.link("https://minecraft-server.eu/vote/index/2227F", "https://minecraft-server.eu/vote/index/2227F"));
+		} else {
+			msg("online", "[", prefix_vote, "§r] " , text.link("https://minecraft-server-list.com/server/478200/vote/", "https://minecraft-server-list.com/server/478200/vote/"));
+		}
+	}
+	goto("wait");
+}
 if(event == "player_move") {
 	player_uuid = player.getUuid(player);
 	last_move_id = map.getOrDefault(actual_move_id, player_uuid, null);
@@ -674,14 +665,14 @@ if(event == "inv_click") {
 				goto("wait");
 			}
 			vp = player.getVotePoints(player);
-			if(vp < 30) {
+			if(vp < 6) {
 				msg.prefix(player, prefix_commands, "Not enough vote points.");
 				goto("wait");
 			}
-			player.setVotePoints(player, vp - 30);
+			player.setVotePoints(player, vp - 6);
 			msg("online", "§6§k#§rMoneyBooster activated!!!§6§k#");
 			money.setBoostFactor(2);
-			sgoto(6000, "resetMoneyBoost");
+			sgoto(12000, "resetMoneyBoost");
 		}
 		goto("wait");
 	}
@@ -1701,9 +1692,9 @@ var = script.getVar(script, var_name);
 msg.prefix(player, "§dScript", concat(var_name, " = ", var));
 goto("wait");
 
-//@vote
-//inv.open(vote_inv, player, concat("Your vote points: §6", text.number(player.getVotePoints(player))));
-//goto("wait");
+@vote
+inv.open(vote_inv, player, concat("Your vote points: §6", text.number(player.getVotePoints(player))));
+goto("wait");
 
 @voxel
 if(size < 1) {
@@ -7722,6 +7713,11 @@ function isAWallSign(location) {
 	return block.hasTag($wall_signs_tag, block.get(location));
 }
 
+function rank.add(index, tech_rank, chat_rank) {
+	$rank_array[index, 0] = tech_rank;
+	$rank_array[index, 1] = chat_rank;
+}
+
 //--------------------------------------------------
 //Databank-Utils
 //--------------------------------------------------
@@ -7984,7 +7980,7 @@ function setCommandHelps() {
 	commandhelp.add("lag");
 	commandhelp.add("live");
 	commandhelp.add("hack");
-	//commandhelp.add("vote");
+	commandhelp.add("vote");
 	
 	commandhelp.addChildPlayer("mute");
 	commandhelp.addChildPlayer("unmute");

+ 0 - 0
system/vote.txt


+ 9 - 1
utils/u_general.txt

@@ -2095,6 +2095,13 @@ function player.getVotePoints(player_or_id) {
 	return config.getDouble(config, "votepoints", 0);
 }
 
+function player.addVotePoints(player_or_id, amount) {
+	config = playerdata.getSurvival(player_or_id);
+	points = config.getDouble(config, "votepoints", 0) + amount;
+	config.set(config, "votepoints", points);
+	config.saveAsync(config);
+}
+
 function player.hasFirstJoin(player_or_id) {
 	config = playerdata.getSurvival(player_or_id);
 	return config.getBool(config, "firstjoin", true);
@@ -2308,7 +2315,7 @@ function subMoney(player_or_id, money) {
 		return;
 	}
 	displayMoney(player, new_money);
-	money.popUp(player, money, false);
+	money.popUp(player, money * -1, false);
 }
 
 function money.popUp(player, money, boosted) {
@@ -2327,6 +2334,7 @@ function money.popUp(player, money, boosted) {
 	}
 	if(money < 0) {
 		pre = "-";
+		money *= -1;
 	}
 	if(boosted) {
 		$boost_blocker = true;