Przeglądaj źródła

removed old colorcodes

Marvin Löschenkohl 4 lat temu
rodzic
commit
198fe6365c

+ 3 - 3
global/gamecenter.txt

@@ -1,6 +1,6 @@
 event.load("living_pre_hurt");
 event.load("player_login");
-event.load("player_pre_respawn");
+event.load("player_post_respawn");
 event.load("block_click");
 event.load("block_break");
 event.load("entity_click");
@@ -307,10 +307,10 @@ if(plot_id == 32 || plot_id == 106) {
 }
 goto("wait");
 
-@player_pre_respawn
+@player_post_respawn
 if(loc.isInGamesWorld(entity.getLocation(player))) {
 	if(!player.hasMinigame(player)) {
-		player.setSpawn(player, world.getGamesSpawn());
+		player.teleport(player, world.getGamesSpawn());
 	}
 }
 goto("wait");

+ 7 - 7
global/ranklist.txt

@@ -1,5 +1,5 @@
 event.load("custom_command");
-stats_prefix = "§b§sStatistic";
+stats_prefix = "§bStatistic";
 
 inverting_list = list.new();
 list.add(inverting_list, "5x5");
@@ -52,12 +52,12 @@ if(event == "custom_command") {
 		if(size == 0) {
 			@statshelp
 			msg.prefix(player, stats_prefix, "§r/stats ...");
-			msg(player, "§b§s - <§b§tgame§b§s> §rShows own stats");
-			msg(player, "§b§s - <§b§tgame§b§s> top §rShows Top Ten");
-			msg(player, "§b§s - <§b§tgame§b§s> <§b§tposition§s> §rShows stats from a position");
-			msg(player, "§b§s - <§b§tgame§b§s> <§b§tplayer§s> §rShows stats from a player");
+			msg(player, "§b - <game> §rShows own stats");
+			msg(player, "§b - <game> top §rShows Top Ten");
+			msg(player, "§b - <game> <position> §rShows stats from a position");
+			msg(player, "§b - <game> <player> §rShows stats from a player");
 			if(perm.has(player, "stats.remove")) {
-				msg(player, "§b§s - <§b§tgame§b§s> <§b§tplayer§s> remove §rRemoves stats from a player");
+				msg(player, "§b - <game> <player> remove §rRemoves stats from a player");
 			}
 			goto("wait");
 		}
@@ -265,7 +265,7 @@ function printClick(player, show_text, command) {
 function playerStatsCore(player, gamename, p_name) {
 	color = map.get($colorcodes, gamename);
 	if(gamename == "Inverting") {
-		msg.prefix(player, concat(color, gamename), concat("Click for stats from §b§s", p_name));
+		msg.prefix(player, concat(color, gamename), concat("Click for stats from §b", p_name));
 		printClick(player, "Inverting 5x5", concat("/invstats ", p_name, " 5x5"));
 		printClick(player, "Inverting 7x7", concat("/invstats ", p_name, " 7x7"));
 		printClick(player, "Inverting 10x10", concat("/invstats ", p_name, " 10x10"));

+ 27 - 96
minigames/bedwars/bedwars.txt

@@ -4,38 +4,22 @@ specific_lobby_handling = true;
 colorcodes = map.new();
 map.add(colorcodes, 0, "§9");
 map.add(colorcodes, 1, "§c");
-map.add(colorcodes, 2, "§z");
-map.add(colorcodes, 3, "§p");
+map.add(colorcodes, 2, "§e");
+map.add(colorcodes, 3, "§2");
 map.add(colorcodes, 4, "§6");
-map.add(colorcodes, 5, "§w");
-map.add(colorcodes, 6, "§f");
+map.add(colorcodes, 5, "§5");
+map.add(colorcodes, 6, "§d");
 map.add(colorcodes, 7, "§0");
-map.add(colorcodes, 8, "§7");
-map.add(colorcodes, 9, "§8");
-map.add(colorcodes, 10, "§5");
-map.add(colorcodes, 11, "§g");
-map.add(colorcodes, 12, "§a");
-map.add(colorcodes, 13, "§3");
-map.add(colorcodes, 14, "§t");
-map.add(colorcodes, 15, "§d");
 
 teamcolortext = map.new();
 map.add(teamcolortext, 0, "§9blue");
 map.add(teamcolortext, 1, "§cred");
-map.add(teamcolortext, 2, "§zyellow");
-map.add(teamcolortext, 3, "§pgreen");
+map.add(teamcolortext, 2, "§eyellow");
+map.add(teamcolortext, 3, "§2green");
 map.add(teamcolortext, 4, "§6orange");
-map.add(teamcolortext, 5, "§wpurple");
-map.add(teamcolortext, 6, "§fwhite");
+map.add(teamcolortext, 5, "§5magenta");
+map.add(teamcolortext, 6, "§dpink");
 map.add(teamcolortext, 7, "§0black");
-map.add(teamcolortext, 8, "§7lightgray");
-map.add(teamcolortext, 9, "§8gray");
-map.add(teamcolortext, 10, "§5magenta");
-map.add(teamcolortext, 11, "§gbrown");
-map.add(teamcolortext, 12, "§alightgreen");
-map.add(teamcolortext, 13, "§3cyan");
-map.add(teamcolortext, 14, "§tlightblue");
-map.add(teamcolortext, 15, "§dpink");
 
 concrete_types = map.new(); //Liste der Bau-Blöcke
 map.add(concrete_types, 0, "minecraft:blue_concrete");
@@ -43,17 +27,9 @@ map.add(concrete_types, 1, "minecraft:red_concrete");
 map.add(concrete_types, 2, "minecraft:yellow_concrete");
 map.add(concrete_types, 3, "minecraft:green_concrete");
 map.add(concrete_types, 4, "minecraft:orange_concrete");
-map.add(concrete_types, 5, "minecraft:purple_concrete");
-map.add(concrete_types, 6, "minecraft:white_concrete");
+map.add(concrete_types, 5, "minecraft:magenta_concrete");
+map.add(concrete_types, 6, "minecraft:pink_concrete");
 map.add(concrete_types, 7, "minecraft:black_concrete");
-map.add(concrete_types, 8, "minecraft:light_gray_concrete");
-map.add(concrete_types, 9, "minecraft:gray_concrete");
-map.add(concrete_types, 10, "minecraft:magenta_concrete");
-map.add(concrete_types, 11, "minecraft:brown_concrete");
-map.add(concrete_types, 12, "minecraft:lime_concrete");
-map.add(concrete_types, 13, "minecraft:cyan_concrete");
-map.add(concrete_types, 14, "minecraft:light_blue_concrete");
-map.add(concrete_types, 15, "minecraft:pink_concrete");
 
 block_click_catcher = set.new();
 playersinteam = map.new(); //Anzahl der Spieler im Team
@@ -163,17 +139,9 @@ map.add(bed_types, 1, "minecraft:red_bed");
 map.add(bed_types, 2, "minecraft:yellow_bed");
 map.add(bed_types, 3, "minecraft:green_bed");
 map.add(bed_types, 4, "minecraft:orange_bed");
-map.add(bed_types, 5, "minecraft:purple_bed");
-map.add(bed_types, 6, "minecraft:white_bed");
+map.add(bed_types, 5, "minecraft:mangenta_bed");
+map.add(bed_types, 6, "minecraft:pink_bed");
 map.add(bed_types, 7, "minecraft:black_bed");
-map.add(bed_types, 8, "minecraft:light_gray_bed");
-map.add(bed_types, 9, "minecraft:gray_bed");
-map.add(bed_types, 10, "minecraft:mangenta_bed");
-map.add(bed_types, 11, "minecraft:brown_bed");
-map.add(bed_types, 12, "minecraft:lime_bed");
-map.add(bed_types, 13, "minecraft:cyan_bed");
-map.add(bed_types, 14, "minecraft:light_blue_bed");
-map.add(bed_types, 15, "minecraft:pink_bed");
 
 glass_types = map.new(); //Liste für Rettungsplattformen
 map.add(glass_types, 0, "minecraft:blue_stained_glass");
@@ -181,17 +149,9 @@ map.add(glass_types, 1, "minecraft:red_stained_glass");
 map.add(glass_types, 2, "minecraft:yellow_stained_glass");
 map.add(glass_types, 3, "minecraft:green_stained_glass");
 map.add(glass_types, 4, "minecraft:orange_stained_glass");
-map.add(glass_types, 5, "minecraft:purple_stained_glass");
-map.add(glass_types, 6, "minecraft:white_stained_glass");
+map.add(glass_types, 5, "minecraft:mangenta_stained_glass");
+map.add(glass_types, 6, "minecraft:pink_stained_glass");
 map.add(glass_types, 7, "minecraft:black_stained_glass");
-map.add(glass_types, 8, "minecraft:light_gray_stained_glass");
-map.add(glass_types, 9, "minecraft:gray_stained_glass");
-map.add(glass_types, 10, "minecraft:mangenta_stained_glass");
-map.add(glass_types, 11, "minecraft:brown_stained_glass");
-map.add(glass_types, 12, "minecraft:lime_stained_glass");
-map.add(glass_types, 13, "minecraft:cyan_stained_glass");
-map.add(glass_types, 14, "minecraft:light_blue_stained_glass");
-map.add(glass_types, 15, "minecraft:pink_stained_glass");
 
 clothescode = map.new(); //Liste der Datenwerte für gefärbte Kleidung
 map.add(clothescode, 0, 5592575);
@@ -199,35 +159,19 @@ map.add(clothescode, 1, 16733525);
 map.add(clothescode, 2, 16777045);
 map.add(clothescode, 3, 5635925);
 map.add(clothescode, 4, 16755200);
-map.add(clothescode, 5, 5636095);
-map.add(clothescode, 6, 16733695);
+map.add(clothescode, 5, 43690);
+map.add(clothescode, 6, 5592405);
 map.add(clothescode, 7, 0);
-map.add(clothescode, 8, 11141120);
-map.add(clothescode, 9, 43520);
-map.add(clothescode, 10, 43690);
-map.add(clothescode, 11, 170);
-map.add(clothescode, 12, 11141290);
-map.add(clothescode, 13, 16777215);
-map.add(clothescode, 14, 11184810);
-map.add(clothescode, 15, 5592405);
 
 teamcolortext2 = map.new();
 map.add(teamcolortext2, 0, "§9Blue");
 map.add(teamcolortext2, 1, "§cRed");
-map.add(teamcolortext2, 2, "§zYellow");
-map.add(teamcolortext2, 3, "§pGreen");
+map.add(teamcolortext2, 2, "§eYellow");
+map.add(teamcolortext2, 3, "§2Green");
 map.add(teamcolortext2, 4, "§6Orange");
-map.add(teamcolortext2, 5, "§wPurple");
-map.add(teamcolortext2, 6, "§fWhite");
+map.add(teamcolortext2, 5, "§5Magenta");
+map.add(teamcolortext2, 6, "§dPink");
 map.add(teamcolortext2, 7, "§0Black");
-map.add(teamcolortext2, 8, "§7Lightgray");
-map.add(teamcolortext2, 9, "§8Gray");
-map.add(teamcolortext2, 10, "§5Magenta");
-map.add(teamcolortext2, 11, "§gBrown");
-map.add(teamcolortext2, 12, "§aLightgreen");
-map.add(teamcolortext2, 13, "§3Cyan");
-map.add(teamcolortext2, 14, "§tLightblue");
-map.add(teamcolortext2, 15, "§dPink");
 
 colornames = map.new();
 map.add(colornames, 0, "blue");
@@ -235,17 +179,9 @@ map.add(colornames, 1, "red");
 map.add(colornames, 2, "yellow");
 map.add(colornames, 3, "green");
 map.add(colornames, 4, "orange");
-map.add(colornames, 5, "purple");
-map.add(colornames, 6, "white");
+map.add(colornames, 5, "magenta");
+map.add(colornames, 6, "pink");
 map.add(colornames, 7, "black");
-map.add(colornames, 8, "light_gray");
-map.add(colornames, 9, "gray");
-map.add(colornames, 10, "magenta");
-map.add(colornames, 11, "brown");
-map.add(colornames, 12, "lime");
-map.add(colornames, 13, "cyan");
-map.add(colornames, 14, "light_blue");
-map.add(colornames, 15, "pink");
 
 while(list.getSize(waiters) != 0) {
 	team = getTeamWithLowestPeople(teamidtolist, numberofteams);
@@ -258,7 +194,6 @@ while(list.getSize(waiters) != 0) {
 }
 
 event.unload("block_click");
-event.load("player_pre_respawn");
 event.load("player_post_respawn");
 event.load("living_death");
 event.load("player_pickup");
@@ -734,8 +669,9 @@ if(block_type == "minecraft:cobweb") {
 }
 goto("checkgame");
 
-@player_pre_respawn
+@player_post_respawn
 tempteam = map.get(players, player_name);
+entity.setName(player, concat(map.get(colorcodes, tempteam), player_name));
 if(map.get(teambedbroken, tempteam)) {
 	gosub("setdisplay");
 	if(!checkPlayability(tempteam)) {
@@ -747,15 +683,10 @@ location2 = loc.mod(location, 0, 1, 0);
 block_type = block.getType(location);
 block_type2 = block.getType(location2);
 while(!(block.isAir(location) && block.isAir(location2))) {
-	location = loc.add(location, 0, 1, 0);
-	location2 = loc.add(location2, 0, 1, 0);
+	loc.add(location, 0, 1, 0);
+	loc.add(location2, 0, 1, 0);
 }
-player.setSpawn(player, location);
-goto("checkgame");
-
-@player_post_respawn
-tempteam = map.get(players, player_name);
-entity.setName(player, concat(map.get(colorcodes, tempteam), player_name));
+entity.teleport(player, location);
 goto("checkgame");
 
 @player_giveup

+ 29 - 69
minigames/capturetheflag/capturetheflag.txt

@@ -11,59 +11,35 @@ TODO und Ideen
 rankingtable = "ctfranks";
 registerRanking(rankingtable);
 
-map.new(colorcodes);
+colorcodes = map.new();
 map.add(colorcodes, 0, "§9");
-map.add(colorcodes, 1, "§4");
-map.add(colorcodes, 2, "§z");
-map.add(colorcodes, 3, "§p");
+map.add(colorcodes, 1, "§c");
+map.add(colorcodes, 2, "§e");
+map.add(colorcodes, 3, "§2");
 map.add(colorcodes, 4, "§6");
-map.add(colorcodes, 5, "§w");
-map.add(colorcodes, 6, "§f");
+map.add(colorcodes, 5, "§5");
+map.add(colorcodes, 6, "§d");
 map.add(colorcodes, 7, "§0");
-map.add(colorcodes, 8, "§7");
-map.add(colorcodes, 9, "§8");
-map.add(colorcodes, 10, "§5");
-map.add(colorcodes, 11, "§g");
-map.add(colorcodes, 12, "§a");
-map.add(colorcodes, 13, "§3");
-map.add(colorcodes, 14, "§t");
-map.add(colorcodes, 15, "§d");
-
-map.new(teamcolortext);
-map.add(teamcolortext, 0, "§9blaue");
-map.add(teamcolortext, 1, "§4rote");
-map.add(teamcolortext, 2, "§zgelbe");
-map.add(teamcolortext, 3, "§pgrüne");
+
+teamcolortext = map.new();
+map.add(teamcolortext, 0, "§9blue");
+map.add(teamcolortext, 1, "§cred");
+map.add(teamcolortext, 2, "§eyellow");
+map.add(teamcolortext, 3, "§2green");
 map.add(teamcolortext, 4, "§6orange");
-map.add(teamcolortext, 5, "§wviolette");
-map.add(teamcolortext, 6, "§fweiße");
-map.add(teamcolortext, 7, "§0schwarze");
-map.add(teamcolortext, 8, "§7hellgraue");
-map.add(teamcolortext, 9, "§8graue");
-map.add(teamcolortext, 10, "§5magenta");
-map.add(teamcolortext, 11, "§gbraune");
-map.add(teamcolortext, 12, "§ahellgrüne");
-map.add(teamcolortext, 13, "§3türkise");
-map.add(teamcolortext, 14, "§thellblaue");
-map.add(teamcolortext, 15, "§drosa");
-
-map.new(teamcolortext2);
-map.add(teamcolortext2, 0, "§9Blau");
-map.add(teamcolortext2, 1, "§4Rot");
-map.add(teamcolortext2, 2, "§zGelb");
-map.add(teamcolortext2, 3, "§pGrün");
+map.add(teamcolortext, 5, "§5magenta");
+map.add(teamcolortext, 6, "§dpink");
+map.add(teamcolortext, 7, "§0black");
+
+teamcolortext2 = map.new();
+map.add(teamcolortext2, 0, "§9Blue");
+map.add(teamcolortext2, 1, "§cRed");
+map.add(teamcolortext2, 2, "§eYellow");
+map.add(teamcolortext2, 3, "§2Green");
 map.add(teamcolortext2, 4, "§6Orange");
-map.add(teamcolortext2, 5, "§wViolett");
-map.add(teamcolortext2, 6, "§fWeiß");
-map.add(teamcolortext2, 7, "§0Schwarz");
-map.add(teamcolortext2, 8, "§7Hellgrau");
-map.add(teamcolortext2, 9, "§8Grau");
-map.add(teamcolortext2, 10, "§5Magenta");
-map.add(teamcolortext2, 11, "§gBraun");
-map.add(teamcolortext2, 12, "§aHellgrün");
-map.add(teamcolortext2, 13, "§3Türkis");
-map.add(teamcolortext2, 14, "§tHellblau");
-map.add(teamcolortext2, 15, "§dRosa");
+map.add(teamcolortext2, 5, "§5Magenta");
+map.add(teamcolortext2, 6, "§dPink");
+map.add(teamcolortext2, 7, "§0Black");
 
 map.new(banners); //Liste der Banner
 map.add(banners, 0, "minecraft:blue_banner");
@@ -72,34 +48,18 @@ map.add(banners, 2, "minecraft:yellow_banner");
 map.add(banners, 3, "minecraft:green_banner");
 map.add(banners, 4, "minecraft:orange_banner");
 map.add(banners, 5, "minecraft:purple_banner");
-map.add(banners, 6, "minecraft:white_banner");
+map.add(banners, 6, "minecraft:pink_banner");
 map.add(banners, 7, "minecraft:black_banner");
-map.add(banners, 8, "minecraft:light_gray_banner");
-map.add(banners, 9, "minecraft:gray_banner");
-map.add(banners, 10, "minecraft:mangenta_banner");
-map.add(banners, 11, "minecraft:brown_banner");
-map.add(banners, 12, "minecraft:lime_banner");
-map.add(banners, 13, "minecraft:cyan_banner");
-map.add(banners, 14, "minecraft:light_blue_banner");
-map.add(banners, 15, "minecraft:pink_banner");
-
-map.new(clothescode); //Liste der Datenwerte für gefärbte Kleidung
+
+clothescode = map.new(); //Liste der Datenwerte für gefärbte Kleidung
 map.add(clothescode, 0, 5592575);
 map.add(clothescode, 1, 16733525);
 map.add(clothescode, 2, 16777045);
 map.add(clothescode, 3, 5635925);
 map.add(clothescode, 4, 16755200);
-map.add(clothescode, 5, 5636095);
-map.add(clothescode, 6, 16733695);
+map.add(clothescode, 5, 43690);
+map.add(clothescode, 6, 5592405);
 map.add(clothescode, 7, 0);
-map.add(clothescode, 8, 11141120);
-map.add(clothescode, 9, 43520);
-map.add(clothescode, 10, 43690);
-map.add(clothescode, 11, 170);
-map.add(clothescode, 12, 11141290);
-map.add(clothescode, 13, 16777215);
-map.add(clothescode, 14, 11184810);
-map.add(clothescode, 15, 5592405);
 
 gosub("setstart");
 

+ 1 - 1
minigames/halma/halma_map1.txt

@@ -44,7 +44,7 @@ map.add(rotations_map, 2, "6"); //green
 
 colors_map = map.new();
 map.add(colors_map, 0, "§c");
-map.add(colors_map, 1, "§t");
+map.add(colors_map, 1, "§b");
 map.add(colors_map, 2, "§a");
 
 north_loc = loc.new(gamesworld, 3974, 97, 2950); //nördlichster punkt

+ 1 - 1
minigames/halma/halma_map2.txt

@@ -44,7 +44,7 @@ map.add(rotations_map, 2, "6"); //green
 
 colors_map = map.new();
 map.add(colors_map, 0, "§c");
-map.add(colors_map, 1, "§t");
+map.add(colors_map, 1, "§b");
 map.add(colors_map, 2, "§a");
 
 north_loc = loc.new(gamesworld, 4514, 97, 3003); //nördlichster punkt

+ 4 - 4
minigames/shoppingchaos/shoppingchaos.txt

@@ -24,14 +24,14 @@ waiters = list.new(); //Spieler in der Lobby ohne Teamzugehörigkeit
 colorcodes = map.new();
 map.add(colorcodes, 0, "§9");
 map.add(colorcodes, 1, "§c");
-map.add(colorcodes, 2, "§z");
-map.add(colorcodes, 3, "§p");
+map.add(colorcodes, 2, "§e");
+map.add(colorcodes, 3, "§2");
 
 teamcolortext = map.new();
 map.add(teamcolortext, 0, "§9blue");
 map.add(teamcolortext, 1, "§cred");
-map.add(teamcolortext, 2, "§zyellow");
-map.add(teamcolortext, 3, "§pgreen");
+map.add(teamcolortext, 2, "§eyellow");
+map.add(teamcolortext, 3, "§2green");
 
 iron_block = "minecraft:iron_block";
 iron_ingot = "minecraft:iron_ingot";

+ 2 - 2
pre_generate.txt

@@ -5,8 +5,8 @@ time = time.getMillis();
 world = world.get("overworld");
 loc = loc.new(world, 0, 0, 0);
 
-gusi = 0; //bereits generierter Bereich
-wusi = 2048; //zu generierender Bereich
+gusi = 1024; //bereits generierter Bereich
+wusi = 1024; //zu generierender Bereich
 
 whole = wusi / 8;
 whole *= whole;

+ 1 - 1
startscript.txt

@@ -19,7 +19,7 @@ script.startNamed("Ticket", "global/ticketsystem", "utils/u_general");
 script.startNamed("Mails", "global/mailsystem", "utils/u_general");
 script.startNamed("Shops", "global/chestshops", "utils/u_general");
 script.startNamed("Survival", "survival/survival", "utils/u_general");
-script.startNamed("Ai", "system/ai", "utils/u_general");
+//script.startNamed("Ai", "system/ai", "utils/u_general");
 script.startNamed("Gamecenter", "global/gamecenter", "utils/u_general", "utils/u_games", "utils/u_party");
 script.startNamed("Ranklist", "global/ranklist", "utils/u_general", "utils/u_games");
 script.startNamed("SpawnQuests", "storydorf/spawn/core", "utils/u_general");

+ 22 - 18
survival/survival.txt

@@ -13,6 +13,7 @@ player_data / player_id
 */
 event.load("entity_click");
 event.load("inv_click");
+event.load("player_pre_respawn");
 event.load("player_post_respawn");
 event.load("player_login");
 event.load("player_logout");
@@ -83,16 +84,15 @@ bank_human_name = "Banker";
 adv_human_name = "Adventure";
 bankmenu = inv.new("233302332233302332");
 bankinvid = inv.getID(bankmenu);
-coin_gold = read.item("km:coin_gold");
-coin_silver = read.item("km:coin_silver");
-coin_silver64 = read.item("km:coin_silver", 64);
-coin_copper = read.item("km:coin_copper");
-coin_copper64 = read.item("km:coin_copper", 64);
-arrow_left = read.item("km:arrow_left", 1, "§rwechseln zu");
-arrow_right = read.item("km:arrow_right", 1, "§rwechseln zu");
-plus_green = read.item("km:plus_green", 1, "§rEinzahlung");
-minus_red = read.item("km:minus_red", 1, "§rAuszahlung");
-inv.setItem(bankmenu, 0, plus_green);
+coin_gold = read.item("km:coin_gold", 1, "§f4096 snuvis");
+coin_silver = read.item("km:coin_silver", 1, "§f64 snuvis");
+coin_copper = read.item("km:coin_copper", 1, "§f1 snuvi");
+coin_silver64 = read.item("km:coin_silver", 64, "§f4096 snuvis");
+coin_copper64 = read.item("km:coin_copper", 64, "§f64 snuvis");
+arrow_left = read.item("km:arrow_left", 1, "§fchange to");
+arrow_right = read.item("km:arrow_right", 1, "§fchange to");
+
+inv.setItem(bankmenu, 0, read.item("km:plus_green", 1, "§fDeposit..."));
 inv.setItem(bankmenu, 1, coin_copper);
 inv.setItem(bankmenu, 2, coin_silver);
 inv.setItem(bankmenu, 3, coin_gold);
@@ -100,7 +100,7 @@ inv.setItem(bankmenu, 4, coin_copper64);
 inv.setItem(bankmenu, 5, arrow_left);
 inv.setItem(bankmenu, 6, arrow_right);
 inv.setItem(bankmenu, 7, coin_silver);
-inv.setItem(bankmenu, 8, minus_red);
+inv.setItem(bankmenu, 8, read.item("km:minus_red", 1, "§fWithdraw..."));
 inv.setItem(bankmenu, 9, coin_copper);
 inv.setItem(bankmenu, 10, coin_silver);
 inv.setItem(bankmenu, 11, coin_gold);
@@ -247,9 +247,9 @@ goto("wait");
 @inv_click
 cancel = true;
 if(inv_id == bankinvid) { //Bankmenü
-	gold_inv = player.getItemAmount(player, true, coin_gold);
-	silver_inv = player.getItemAmount(player, true, coin_silver);
-	copper_inv = player.getItemAmount(player, true, coin_copper);
+	gold_inv = player.getItemAmount(player, false, coin_gold);
+	silver_inv = player.getItemAmount(player, false, coin_silver);
+	copper_inv = player.getItemAmount(player, false, coin_copper);
 	//Wechseln
 	if(inv_slot == 5 || inv_slot == 6 || inv_slot == 13 || inv_slot == 14)  {
 		if(inv_slot == 5) {
@@ -296,11 +296,11 @@ if(inv_id == bankinvid) { //Bankmenü
 			msg.prefix(player, prefix_money, message);
 			goto("wait");
 		}
-		player.removeItem(player, item1);
+		player.removeItem2(player, item1);
 		notgiven = player.giveItem(player, item2);
 		if(item.getType(notgiven) != "minecraft:air") {
 			amount = item.getAmount(notgiven);
-			player.removeItem(player, read.item(item_type, amount2 - amount));
+			player.removeItem2(player, read.item(item_type, amount2 - amount));
 			player.giveItem(player, item1);
 			msg.prefix(player, prefix_money, "Not enough space in inventory.");
 			goto("wait");
@@ -329,7 +329,7 @@ if(inv_id == bankinvid) { //Bankmenü
 			msg.prefix(player, prefix_money, "§rCoin not in inventory.");
 		} else {
 			addMoney(player, betrag);
-			player.removeItem(player, inv.getItem(bankmenu, inv_slot));
+			player.removeItem2(player, inv.getItem(bankmenu, inv_slot));
 			inv.update(player);
 		}
 		goto("wait");
@@ -751,7 +751,7 @@ if(isPlayer(living_entity)) {
 	if(subcu_amount > 0) {
 		new_subcu_amount = subcu_amount - 1;
 		skill.setAmount(player, "skill.subcu_inv", new_subcu_amount);
-		msg.prefix(player, "§2§qSkill", concat("Used Subcutaneous Inventory. New amount: ", text.number(new_subcu_amount)));
+		msg.prefix(player, "§2Skill", concat("Used Subcutaneous Inventory. New amount: ", text.number(new_subcu_amount)));
 	} else {
 		player.dropInventory(player, loc);
 	}
@@ -799,6 +799,10 @@ block.set(location, concat(block_type, "[age=0]"));
 player.damageItem(player, 1);
 goto("wait");
 
+@player_pre_respawn
+//player.setSpawn(player, );
+goto("wait");
+
 @player_post_respawn
 if(player.isOnAdventure(player)) {
 	tp_loc = player.getAdventureStart(player);

+ 56 - 56
system/commands.txt

@@ -154,7 +154,7 @@ prefix_tips = "§eTips";
 prefix_lock = "§eLock";
 prefix_commands = "§6Commands";
 prefix_friends = "§5Friends";
-prefix_world = "§6World";
+prefix_world = "§bWorld";
 prefix_jail = "§5Jail";
 prefix_quest = "§dQuest";
 prefix_perms = "§6Perms";
@@ -374,7 +374,7 @@ if(event == "block_place") {
 				cancel = true;
 				owner_uuid = lock.getOwner(b_loc);
 				owner_name = player.getName(owner_uuid);
-				msg.prefix(player, prefix_lock, concat("This chest was locked by §e§y", owner_name, "§r."));
+				msg.prefix(player, prefix_lock, concat("This chest was locked by §e", owner_name, "§r."));
 				goto("wait");
 			}
 		}
@@ -393,7 +393,7 @@ if(event == "block_place") {
 				cancel = true;
 				owner_uuid = lock.getOwner(chest_loc2);
 				owner_name = player.getName(owner_uuid);
-				msg.prefix(player, prefix_lock, concat("This chest was locked by §e§y", owner_name, "§r."));
+				msg.prefix(player, prefix_lock, concat("This chest was locked by §e", owner_name, "§r."));
 				goto("wait");
 			}
 			//Sicherung erweitern
@@ -414,7 +414,7 @@ if(event == "block_break") {
 				cancel = true;
 				owner_uuid = lock.getOwner(block_loc);
 				owner_name = player.getName(owner_uuid);
-				msg.prefix(player, prefix_lock, concat("This chest was locked by §e§y", owner_name, "§r."));
+				msg.prefix(player, prefix_lock, concat("This chest was locked by §e", owner_name, "§r."));
 				goto("wait");
 			}
 			//Sicherung entfernen
@@ -760,10 +760,10 @@ if(!isSurvWorldName(world_name)) {
 if(size == 0) {
 	@lockhelp
 	msg.prefix(player, prefix_lock, "§r/lock ...");
-	msg(player, "§e§y- create §rAdds a security");
-	msg(player, "§e§y- delete §rRemoves a security");
-	msg(player, "§e§y- share <player> §rShares the security with a player");
-	msg(player, "§e§y- kick <player> §rremoves a player from a security");
+	msg(player, "§e- create §rAdds a security");
+	msg(player, "§e- delete §rRemoves a security");
+	msg(player, "§e- share <player> §rShares the security with a player");
+	msg(player, "§e- kick <player> §rremoves a player from a security");
 	goto("wait");
 }
 arg0 = text.toLowerCase(list.getIndex(args, 0));
@@ -779,7 +779,7 @@ if(arg0 == "create") {
 	if(lock.isLocked(target_loc)) {
 		owner_uuid = lock.getOwner(target_loc);
 		owner_name = player.getName(owner_uuid);
-		msg.prefix(player, prefix_lock, concat("This chest was locked by §e§y", owner_name, "§r."));
+		msg.prefix(player, prefix_lock, concat("This chest was locked by §e", owner_name, "§r."));
 		goto("wait");
 	}
 	//Kiste sichern
@@ -809,7 +809,7 @@ if(arg0 == "delete") {
 	owner_uuid = lock.getOwner(target_loc);
 	if(owner_uuid != uuid) {
 		owner_name = player.getName(owner_uuid);
-		msg.prefix(player, prefix_lock, concat("This chest was locked by §e§y", owner_name, "§r."));
+		msg.prefix(player, prefix_lock, concat("This chest was locked by §e", owner_name, "§r."));
 		goto("wait");
 	}
 	//Kiste entsichern
@@ -849,20 +849,20 @@ if(arg0 == "share") {
 	owner_uuid = lock.getOwner(target_loc);
 	if(owner_uuid != uuid) {
 		owner_name = player.getName(owner_uuid);
-		msg.prefix(player, prefix_lock, concat("This chest was locked by §e§y", owner_name, "§r."));
+		msg.prefix(player, prefix_lock, concat("This chest was locked by §e", owner_name, "§r."));
 		goto("wait");
 	}
 	//Kistensicherung erweitern
 	success = lock.share(target_loc, p_uuid);
 	if(!success) {
-		msg.prefix(player, prefix_lock, concat("§e§y", p_name, "§r already has access."));
+		msg.prefix(player, prefix_lock, concat("§e", p_name, "§r already has access."));
 		goto("wait");
 	}
 	chest_loc2 = block.getSecChest(target_loc);
 	if(chest_loc2 != null) {
 		lock.share(chest_loc2, p_uuid);
 	}
-	msg.prefix(player, prefix_lock, concat("§e§y", p_name, "§r has been granted access."));
+	msg.prefix(player, prefix_lock, concat("§e", p_name, "§r has been granted access."));
 	goto("wait");
 }
 if(arg0 == "kick") {
@@ -893,7 +893,7 @@ if(arg0 == "kick") {
 	owner_uuid = lock.getOwner(target_loc);
 	if(owner_uuid != uuid) {
 		owner_name = player.getName(owner_uuid);
-		msg.prefix(player, prefix_lock, concat("This chest was locked by §e§y", owner_name, "§r."));
+		msg.prefix(player, prefix_lock, concat("This chest was locked by §e", owner_name, "§r."));
 		goto("wait");
 	}
 	//Owner kann sich nicht selbst entfernen
@@ -904,14 +904,14 @@ if(arg0 == "kick") {
 	//Kistensicherung erweitern
 	success = lock.kick(target_loc, p_uuid);
 	if(!success) {
-		msg.prefix(player, prefix_lock, concat("This chest isn't secured §e§y", p_name, "§r."));
+		msg.prefix(player, prefix_lock, concat("This chest isn't secured §e", p_name, "§r."));
 		goto("wait");
 	}
 	chest_loc2 = block.getSecChest(target_loc);
 	if(chest_loc2 != null) {
 		lock.kick(chest_loc2, p_uuid);
 	}
-	msg.prefix(player, prefix_lock, concat("§e§y", p_name, "§r removed from chest security."));
+	msg.prefix(player, prefix_lock, concat("§e", p_name, "§r removed from chest security."));
 	goto("wait");
 }
 goto("lockhelp");
@@ -1554,7 +1554,7 @@ if(arg0 == "remove") {
 		player_id = player.getId(player);
 		if(player_id != 2) {
 			if(p_id == 2) {
-				msg(player, "§cSorry §s¯\\_(ツ)_/¯");
+				msg(player, "§cSorry §b¯\\_(ツ)_/¯");
 				goto("wait");
 			}
 		}
@@ -1586,7 +1586,7 @@ if(arg0 == "removeall") {
 		player_id = player.getId(player);
 		if(player_id != 2) {
 			if(p_id == 2) {
-				msg(player, "§cSorry §s¯\\_(ツ)_/¯");
+				msg(player, "§cSorry §b¯\\_(ツ)_/¯");
 				goto("wait");
 			}
 		}
@@ -2402,9 +2402,9 @@ if(size == 0) {
 			hours = math.roundDown(minutes / 60);
 			mod_minutes = minutes % 60;
 			if(mod_minutes < 10) {
-				time_string = concat("§6§v", text.number(hours), ":0", text.number(mod_minutes), " h");
+				time_string = concat("§6", text.number(hours), ":0", text.number(mod_minutes), " h");
 			} else {
-				time_string = concat("§6§v", text.number(hours), ":", text.number(mod_minutes), " h");
+				time_string = concat("§6", text.number(hours), ":", text.number(mod_minutes), " h");
 			}
 			pre_minutes = list.getIndex(temp_list, i - 1);
 			if(minutes >= pre_minutes) {
@@ -2487,9 +2487,9 @@ if(size == 0) {
 			hours = math.roundDown(minutes / 60);
 			minutes = minutes % 60;
 			if(minutes < 10) {
-				time_string = concat("§6§v", text.number(hours), ":0", text.number(minutes), " h");
+				time_string = concat("§6", text.number(hours), ":0", text.number(minutes), " h");
 			} else {
-				time_string = concat("§6§v", text.number(hours), ":", text.number(minutes), " h");
+				time_string = concat("§6", text.number(hours), ":", text.number(minutes), " h");
 			}
 			msg(player, table.get(table, concat("§6", text.number(i)), time_string, text.number(players)));
 			if(i == now_day && month == now_month && year == now_year) {
@@ -2576,14 +2576,14 @@ goto("wait");
 if(size == 0) {
 	@datatoolshelp
 	msg.prefix(player, prefix_datatools, "/datatools ...");
-	msg(player, "§6§v - hide <name> §rHides wusi on an itemstack");
-	msg(player, "§6§v - attribute <attribut> <slot> <double> <op> §rFügt ein Attribut zu einem ItemStack hinzu");
-	msg(player, "§6§v - hide-entity §rMacht ein Entity unsichtbar");
-	msg(player, "§6§v - show-entity §rMacht ein Entity sichtbar");
-	msg(player, "§6§v - name-entity <name> §rSetzt den Namen des Entities");
-	msg(player, "§6§v - name-visibility <boolean> §rZeigt den Namen (nicht) dauerhaft");
-	msg(player, "§6§v - name-item <name> §rSetzt den Itemnamen");
-	msg(player, "§6§v - lore-item <line> <lore> §rSetzt die Itemlore");
+	msg(player, "§6 - hide <name> §rHides wusi on an itemstack");
+	msg(player, "§6 - attribute <attribut> <slot> <double> <op> §rFügt ein Attribut zu einem ItemStack hinzu");
+	msg(player, "§6 - hide-entity §rMacht ein Entity unsichtbar");
+	msg(player, "§6 - show-entity §rMacht ein Entity sichtbar");
+	msg(player, "§6 - name-entity <name> §rSetzt den Namen des Entities");
+	msg(player, "§6 - name-visibility <boolean> §rZeigt den Namen (nicht) dauerhaft");
+	msg(player, "§6 - name-item <name> §rSetzt den Itemnamen");
+	msg(player, "§6 - lore-item <line> <lore> §rSetzt die Itemlore");
 	goto("wait");
 }
 arg0 = text.toLowerCase(list.getIndex(args, 0));
@@ -2777,15 +2777,15 @@ goto("datatoolshelp");
 if(size == 0) {
 	@humanhelp
 	msg.prefix(player, prefix_human, "/human ...");
-	msg(player, concat("§6§v - spawn §rSpawnt einen Human"));
-	msg(player, concat("§6§v - set <name> §rSetzt den Skin"));
-	msg(player, concat("§6§v - setuuid <uuid> §rSetzt den Skin"));
-	msg(player, concat("§6§v - name §rSetzt den Namen"));
-	msg(player, concat("§6§v - kill §rTötet einen Human"));
-	msg(player, concat("§6§v - size <scale> §rSetzt die Größenskalierung"));
-	msg(player, concat("§6§v - steve §rSchaltet auf Steve Skin"));
-	msg(player, concat("§6§v - alex §rSchaltet auf Alex Skin"));
-	msg(player, concat("§6§v - statue <bool> §rToggles between statue"));
+	msg(player, concat("§6 - spawn §rSpawnt einen Human"));
+	msg(player, concat("§6 - set <name> §rSetzt den Skin"));
+	msg(player, concat("§6 - setuuid <uuid> §rSetzt den Skin"));
+	msg(player, concat("§6 - name §rSetzt den Namen"));
+	msg(player, concat("§6 - kill §rTötet einen Human"));
+	msg(player, concat("§6 - size <scale> §rSetzt die Größenskalierung"));
+	msg(player, concat("§6 - steve §rSchaltet auf Steve Skin"));
+	msg(player, concat("§6 - alex §rSchaltet auf Alex Skin"));
+	msg(player, concat("§6 - statue <bool> §rToggles between statue"));
 	goto("wait");
 }
 arg0 = text.toLowerCase(list.getIndex(args, 0));
@@ -3107,7 +3107,7 @@ if(!isOnline(p_name)) {
 p = read.player(p_name);
 p_name = player.getName(p);
 if(p_name == "marvinius") {
-	msg(sender, "§cSorry §s¯\\_(ツ)_/¯");
+	msg(sender, "§cSorry §b¯\\_(ツ)_/¯");
 	goto("wait");
 }
 msg("online", concat("§c", p_name, " was muted by ", sender_name, "."));
@@ -3127,7 +3127,7 @@ if(!isOnline(p_name)) {
 p = read.player(p_name);
 p_name = player.getName(p);
 if(p_name == "marvinius") {
-	msg(sender, "§cSorry §s¯\\_(ツ)_/¯");
+	msg(sender, "§cSorry §b¯\\_(ツ)_/¯");
 	goto("wait");
 }
 msg("online", concat("§c", p_name, " was unmuted by ", sender_name, "."));
@@ -3147,7 +3147,7 @@ if(!isOnline(p_name)) {
 p = read.player(p_name);
 p_name = player.getName(p);
 if(p_name == "marvinius") {
-	msg(sender, "§cSorry §s¯\\_(ツ)_/¯");
+	msg(sender, "§cSorry §b¯\\_(ツ)_/¯");
 	goto("wait");
 }
 if(size > 1) {
@@ -3173,7 +3173,7 @@ if(!isOnline(p_name)) {
 p = read.player(p_name);
 p_name = player.getName(p);
 if(p_name == "marvinius") {
-	msg(sender, "§cSorry §s¯\\_(ツ)_/¯");
+	msg(sender, "§cSorry §b¯\\_(ツ)_/¯");
 	goto("wait");
 }
 if(size > 1) {
@@ -3199,7 +3199,7 @@ if(!isOnline(p_name)) {
 p = read.player(p_name);
 p_name = player.getName(p);
 if(p_name == "marvinius") {
-	msg(player, "§cSorry §s¯\\_(ツ)_/¯");
+	msg(player, "§cSorry §b¯\\_(ツ)_/¯");
 	goto("wait");
 }
 head.add(p, 0, sender_name, 160, 50, 20);
@@ -3231,7 +3231,7 @@ if(!checkIfEverOnline(p_name)) {
 }
 p_name = player.getName(player.getUuid(p_name));
 if(p_name == "marvinius") {
-	msg(sender, "§cSorry §s¯\\_(ツ)_/¯");
+	msg(sender, "§cSorry §b¯\\_(ツ)_/¯");
 	goto("wait");
 }
 if(size > 1) {
@@ -3262,7 +3262,7 @@ if(!checkIfEverOnline(p_name)) {
 }
 p_name = player.getName(player.getUuid(p_name));
 if(p_name == "marvinius") {
-	msg(sender, "§cSorry §s¯\\_(ツ)_/¯");
+	msg(sender, "§cSorry §b¯\\_(ツ)_/¯");
 	goto("wait");
 }
 if(size > 1) {
@@ -3306,7 +3306,7 @@ if(!checkIfEverOnline(p_name)) {
 }
 p_name = player.getName(player.getUuid(p_name));
 if(p_name == "marvinius") {
-	msg(sender, "§cSorry §s¯\\_(ツ)_/¯");
+	msg(sender, "§cSorry §b¯\\_(ツ)_/¯");
 	goto("wait");
 }
 days = list.getIndex(args, 1);
@@ -4867,7 +4867,7 @@ while(databank.next(result)) {
 	minute = correctTimeFormat(minute);
 	dateformat = concat(day, ".", month, ".", year);
 	clockformat = concat(hour, ":", minute);
-    msg.prefix(player, prefix_commands, concat(seen_name, " war zuletzt am §v", dateformat, "§r um §v",  clockformat, " Uhr §ronline."));
+    msg.prefix(player, prefix_commands, concat(seen_name, " war zuletzt am §e", dateformat, "§r um §e",  clockformat, " Uhr §ronline."));
 	varset = true;
 }
 databank.close(result);
@@ -4903,7 +4903,7 @@ result = databank.execute(lastseenStatement);
 while(databank.next(result)) {
 	id = databank.getInt(result, 1);
 	time = databank.getLong(result, 2);
-	msg(sender, table.get(table, concat("§a", player.getNameFromId(id)), concat("§e§v", getTimeString(time))));
+	msg(sender, table.get(table, concat("§a", player.getNameFromId(id)), concat("§e", getTimeString(time))));
 }
 msg(sender, table.getEnd(table));
 databank.close(result);
@@ -5949,13 +5949,13 @@ goto("wait");
 if(size == 0) {
 	@world_syntax
 	msg.prefix(player, prefix_world, "/world ...");
-	msg(player, "§6§t - info <world> §rShows info about a world");
-	msg(player, "§6§t - tp <world> [player] §rTeleports a player to a world");
-	msg(player, "§6§t - list §rShows all loaded worlds");
-	msg(player, "§6§t - load <world> §rLoads a world");
-	msg(player, "§6§t - unload <world> §rUnloads a world (removes it from memory)");
-	msg(player, "§6§t - setspawn §rSets the world's spawn");
-	msg(player, "§6§t - diffi <world> <diffi> §rSets the world's difficulty");
+	msg(player, "§b - info <world> §rShows info about a world");
+	msg(player, "§b - tp <world> [player] §rTeleports a player to a world");
+	msg(player, "§b - list §rShows all loaded worlds");
+	msg(player, "§b - load <world> §rLoads a world");
+	msg(player, "§b - unload <world> §rUnloads a world (removes it from memory)");
+	msg(player, "§b - setspawn §rSets the world's spawn");
+	msg(player, "§b - diffi <world> <diffi> §rSets the world's difficulty");
 	goto("wait");
 }
 arg0 = text.toLowerCase(list.getIndex(args, 0));

+ 0 - 3
test.txt

@@ -1,3 +0,0 @@
-player = read.player("marvinius");
-speed = 20;
-living.setFlyingSpeed(player, speed / 10 * 4);

+ 23 - 0
utils/u_general.txt

@@ -1279,6 +1279,29 @@ function msg.radius(prefix, message, location, radius) {
 //Player-Utils
 //--------------------------------------------------
 
+function player.removeItem2(player, itemstack) {
+	item_type = item.getType(itemstack);
+	amount = item.getAmount(itemstack);
+	my_item = read.item(item_type, amount); //Kopie erstellen
+	item.setAmount(my_item, 1);
+	for(slot = 0; slot <= 35; slot++) {
+		item = player.getInvSlot(player, slot);
+		if(item.getType(item) == item_type) {
+			amount2 = item.getAmount(item);
+			diff = amount - amount2;
+			if(diff > 0) {
+				amount = diff;
+				item.setAmount(item, 0);
+			} else {
+				item.setAmount(item, math.abs(diff));
+				return null;
+			}
+		}
+	}
+	item.setAmount(my_item, amount);
+	return my_item;
+}
+
 function player.showDebug(player, boolean) {
 	player_uuid = player.getUuid(player);
 	if(boolean) {