Browse Source

finished deprecating humans

Marvin Löschenkohl 1 year ago
parent
commit
4fe073a09e
8 changed files with 16 additions and 408 deletions
  1. 11 30
      minigames/gamecenter.txt
  2. 1 3
      startscript.txt
  3. 0 259
      survival/recipes.txt
  4. 3 83
      system/commands.txt
  5. 1 1
      system/damage.txt
  6. 0 3
      system/init.txt
  7. 0 22
      utils/u_cmdhelp.txt
  8. 0 7
      utils/u_general.txt

+ 11 - 30
minigames/gamecenter.txt

@@ -4,7 +4,6 @@ event.load("player_pre_respawn");
 event.load("player_post_respawn");
 event.load("block_click");
 event.load("block_break");
-event.load("entity_click");
 event.load("custom_command");
 event.load("term_script");
 event.load("player_move");
@@ -30,15 +29,15 @@ dice_loc_rm5 = loc.new(gamesworld, -3064, 156, 1061);
 dice_time = time.getMillis();
 move_id_to_spawn = event.addMoveData(loc.new(gamesworld, -415, 148, -62), loc.new(gamesworld, -411, 153, -58), 5, -1);
 
-minigame.addSign("bwmapsign1", true, loc.new(gamesworld, -423, 158, -42), "minigames/bedwars/bedwars", "minigames/bedwars/bwmap1", false);
-minigame.addSign("bwmapsign2", true, loc.new(gamesworld, -423, 158, -43), "minigames/bedwars/bedwars", "minigames/bedwars/bwmap2", false);
-minigame.addSign("bwmapsign3", true, loc.new(gamesworld, -423, 158, -44), "minigames/bedwars/bedwars", "minigames/bedwars/bwmap3", false);
-minigame.addSign("bwmapsign4", true, loc.new(gamesworld, -423, 157, -42), "minigames/bedwars/bedwars", "minigames/bedwars/bwmap4", false);
-minigame.addSign("bwmapsign5", true, loc.new(gamesworld, -423, 157, -43), "minigames/bedwars/bedwars", "minigames/bedwars/bwmap5", false);
-minigame.addSign("bwmapsign6", true, loc.new(gamesworld, -423, 157, -44), "minigames/bedwars/bedwars", "minigames/bedwars/bwmap6", false);
-minigame.addSign("bwmapsign7", true, loc.new(gamesworld, -423, 156, -42), "minigames/bedwars/bedwars", "minigames/bedwars/bwmap7", false);
-minigame.addSign("bwmapsign8", true, loc.new(gamesworld, -423, 156, -43), "minigames/bedwars/bedwars", "minigames/bedwars/bwmap8", false);
-minigame.addSign("bwmapsign9", true, loc.new(gamesworld, -423, 156, -44), "minigames/bedwars/bedwars", "minigames/bedwars/bwmap9", false);
+minigame.addSign("bwmapsign1", false, loc.new(gamesworld, -423, 158, -42), "minigames/bedwars/bedwars", "minigames/bedwars/bwmap1", false);
+minigame.addSign("bwmapsign2", false, loc.new(gamesworld, -423, 158, -43), "minigames/bedwars/bedwars", "minigames/bedwars/bwmap2", false);
+minigame.addSign("bwmapsign3", false, loc.new(gamesworld, -423, 158, -44), "minigames/bedwars/bedwars", "minigames/bedwars/bwmap3", false);
+minigame.addSign("bwmapsign4", false, loc.new(gamesworld, -423, 157, -42), "minigames/bedwars/bedwars", "minigames/bedwars/bwmap4", false);
+minigame.addSign("bwmapsign5", false, loc.new(gamesworld, -423, 157, -43), "minigames/bedwars/bedwars", "minigames/bedwars/bwmap5", false);
+minigame.addSign("bwmapsign6", false, loc.new(gamesworld, -423, 157, -44), "minigames/bedwars/bedwars", "minigames/bedwars/bwmap6", false);
+minigame.addSign("bwmapsign7", false, loc.new(gamesworld, -423, 156, -42), "minigames/bedwars/bedwars", "minigames/bedwars/bwmap7", false);
+minigame.addSign("bwmapsign8", false, loc.new(gamesworld, -423, 156, -43), "minigames/bedwars/bedwars", "minigames/bedwars/bwmap8", false);
+minigame.addSign("bwmapsign9", false, loc.new(gamesworld, -423, 156, -44), "minigames/bedwars/bedwars", "minigames/bedwars/bwmap9", false);
 minigame.addSign("letterssign1", true, loc.new(gamesworld, -396, 158, -63), "minigames/letters/letters", "minigames/letters/lettersmap1", true);
 minigame.addSign("letterssign2", true, loc.new(gamesworld, -396, 158, -62), "minigames/letters/letters", "minigames/letters/lettersmap2", true);
 minigame.addSign("letterssign3", true, loc.new(gamesworld, -396, 158, -61), "minigames/letters/letters", "minigames/letters/lettersmap3", true);
@@ -85,12 +84,12 @@ minigame.addSign("rebuildsign1", true, loc.new(gamesworld, -414, 157, -33), "min
 minigame.addSign("rebuildsign2", true, loc.new(gamesworld, -415, 157, -33), "minigames/rebuild/rebuild", "minigames/rebuild/rebuildmap2", false);
 minigame.addSign("hideandseeksign1", true, loc.new(gamesworld, -418, 158, -33), "minigames/hideandseek/hideandseek", "minigames/hideandseek/hideandseekmap1", false);
 minigame.addSign("hideandseeksign2", true, loc.new(gamesworld, -419, 158, -33), "minigames/hideandseek/hideandseek", "minigames/hideandseek/hideandseekmap2", false);
-minigame.addSign("shoppingsign1", true, loc.new(gamesworld, -414, 156, -33), "minigames/shoppingchaos/shoppingchaos", "minigames/shoppingchaos/shopping_map1", false);
+minigame.addSign("shoppingsign1", false, loc.new(gamesworld, -414, 156, -33), "minigames/shoppingchaos/shoppingchaos", "minigames/shoppingchaos/shopping_map1", false);
 minigame.addSign("mengersign1", true, loc.new(gamesworld, -405, 157, -75), "minigames/mengerrun/mengerrun", "minigames/mengerrun/menger_map1", false);
 minigame.addSign("leapfrogsign1", true, loc.new(gamesworld, -399, 157, -65), "minigames/leapfrog/leapfrog", "minigames/leapfrog/leapfrogmap1", true);
 minigame.addSign("snowsign1", true, loc.new(gamesworld, -412, 156, -37), "minigames/snowfight/snowfight", "minigames/snowfight/snowmap1", false);
 minigame.addSign("snowsign2", true, loc.new(gamesworld, -412, 156, -36), "minigames/snowfight/snowfight", "minigames/snowfight/snowmap2", false);
-minigame.addSign("among_us_sign1", true, loc.new(gamesworld, -417, 157, -41), "minigames/among_us/among_us", "minigames/among_us/among_us_map1", false);
+minigame.addSign("among_us_sign1", false, loc.new(gamesworld, -417, 157, -41), "minigames/among_us/among_us", "minigames/among_us/among_us_map1", false);
 minigame.addSign("jr_sign_4D_1", true, loc.new(gamesworld, -396, 156, -51), "minigames/jumpnrun/4d/4d_j_r_core", "minigames/jumpnrun/4d/4d_j_r_map1", true);
 minigame.addSign("jr_sign_4D_3", true, loc.new(gamesworld, -396, 156, -49), "minigames/jumpnrun/4d/4d_j_r_core", "minigames/jumpnrun/4d/4d_j_r_map3", true);
 minigame.addSign("s_sign_4D_1", true, loc.new(gamesworld, -396, 156, -50), "minigames/jumpnrun/4d/3d_shadow/shadow_jump_core", "minigames/jumpnrun/4d/3d_shadow/3d_s_map1", true);
@@ -222,24 +221,6 @@ if(command == "game") {
 }
 goto("wait");
 
-@entity_click
-if(slot.isOffHand(hand)) {
-	goto("wait");
-}
-player_loc = entity.getLocation(player);
-if(!loc.isInGamesWorld(player_loc)) {
-	goto("wait");
-}
-if(!isCitizen(entity)) {
-	goto("wait");
-}
-entity_name = entity.getName(entity);
-string_name = string.text(entity_name);
-if(string_name == "marvinius") {
-	msg.prefix(player, "§cGamerMarv", "Help! I'm being held here against my will!");
-}
-goto("wait");
-
 @block_break
 block_loc = block.getLocation(block);
 if(set.contains(gamesign_ground_block_loc, block_loc) || map.contains(gamepaths, block_loc)) {

+ 1 - 3
startscript.txt

@@ -29,7 +29,7 @@ script.startNamed("Creative", "utils/u_error", "system/creative", "utils/u_gener
 script.startNamed("Copyisland", "system/copyisland", "utils/u_general");
 script.startNamed("Damage", "utils/u_error", "system/damage", "utils/u_general");
 script.startNamed("Doors", "utils/u_error", "system/doors", "utils/u_general");
-script.startNamed("Herobrine", "utils/u_error", "survival/herobrine", "utils/u_general");
+//script.startNamed("Herobrine", "utils/u_error", "survival/herobrine", "utils/u_general");
 script.startNamed("Playtime", "system/playtime", "utils/u_general");
 script.startNamed("LoginRequests", "system/login_requests", "utils/u_general");
 script.startNamed("Gemstones", "utils/u_error", "survival/gemstones", "utils/u_general");
@@ -47,8 +47,6 @@ script.startNamed("Ranklist", "utils/u_error", "system/ranklist", "utils/u_gener
 //script.startNamed("Story", "utils/u_error", "story/story", "utils/u_general");
 script.startNamed("QuestsAdmont", "utils/u_error", "story/admont/core", "utils/u_general", "utils/u_quest");
 //script.startNamed("QuestsSchiffbruch", "utils/u_error", "story/schiffbruch/core", "utils/u_general", "utils/u_quest");
-//script.startNamed("Workberries", "system/workberries");
-//script.startNamed("Recipes", "survival/recipes");
 script.startNamed("Timber", "utils/u_error", "survival/timber", "utils/u_general", "utils/u_skills");
 //script.startNamed("Loom", "utils/u_error", "survival/loom", "utils/u_general");
 //script.startNamed("Lectern", "utils/u_error", "survival/lectern", "utils/u_general");

+ 0 - 259
survival/recipes.txt

@@ -1,259 +0,0 @@
-event.load("entity_click");
-event.load("inv_click");
-
-items_list = list.new(); //Array-List: Alle Items mit Rezepten
-recipe_site_map = map.new();
-
-air = "minecraft:air";
-air_item = read.item("air");
-leather = "minecraft:leather";
-string = "minecraft:string";
-bronze_ingot = "km:bronze_ingot";
-copper_ingot = "km:copper_ingot";
-tin_ingot = "km:tin_ingot";
-silver_ingot = "km:silver_ingot";
-stick = "minecraft:stick";
-planks = "minecraft:oak_planks";
-cobblestone = "minecraft:cobblestone";
-iron_ingot = "minecraft:iron_ingot";
-gold_ingot = "minecraft:gold_ingot";
-diamond = "minecraft:diamond";
-book = "minecraft:book";
-birch_planks = "minecraft:birch_planks";
-dark_oak_planks = "minecraft:dark_oak_planks";
-jungle_planks = "minecraft:jungle_planks";
-spruce_planks = "minecraft:spruce_planks";
-acacia_planks = "minecraft:acacia_planks";
-coarse_dirt = "minecraft:coarse_dirt";
-gravel = "minecraft:gravel";
-wheat = "minecraft:wheat";
-grass = "minecraft:grass";
-iron_nugget = "minecraft:iron_nugget";
-hay_bundle = "km:hay_bundle";
-real_hay_block = "km:real_hay_block";
-cloth = "km:cloth";
-
-recipe.add(1, "minecraft:saddle", leather, leather, leather, leather, string, leather, air, iron_ingot, air);
-recipe.add(1, "km:bronze_helmet", bronze_ingot, bronze_ingot, bronze_ingot, bronze_ingot, air, bronze_ingot, air, air, air);
-recipe.add(1, "km:bronze_chestplate", bronze_ingot, air, bronze_ingot, bronze_ingot, bronze_ingot, bronze_ingot, bronze_ingot, bronze_ingot, bronze_ingot);
-recipe.add(1, "km:bronze_leggings", bronze_ingot, bronze_ingot, bronze_ingot, bronze_ingot, air, bronze_ingot, bronze_ingot, air, bronze_ingot);
-recipe.add(1, "km:bronze_boots", bronze_ingot, air, bronze_ingot, bronze_ingot, air, bronze_ingot, air, air, air);
-recipe.add(1, "km:copper_helmet", copper_ingot, copper_ingot, copper_ingot, copper_ingot, air, copper_ingot, air, air, air);
-recipe.add(1, "km:copper_chestplate", copper_ingot, air, copper_ingot, copper_ingot, copper_ingot, copper_ingot, copper_ingot, copper_ingot, copper_ingot);
-recipe.add(1, "km:copper_leggings", copper_ingot, copper_ingot, copper_ingot, copper_ingot, air, copper_ingot, copper_ingot, air, copper_ingot);
-recipe.add(1, "km:copper_boots", copper_ingot, air, copper_ingot, copper_ingot, air, copper_ingot, air, air, air);
-recipe.add(1, "km:bookshelf_acacia", acacia_planks, acacia_planks, acacia_planks, book, book, book, acacia_planks, acacia_planks, acacia_planks);
-recipe.add(1, "km:bookshelf_birch", birch_planks, birch_planks, birch_planks, book, book, book, birch_planks, birch_planks, birch_planks);
-recipe.add(1, "km:bookshelf_dark_oak", dark_oak_planks, dark_oak_planks, dark_oak_planks, book, book, book, dark_oak_planks, dark_oak_planks, dark_oak_planks);
-recipe.add(1, "km:bookshelf_jungle", jungle_planks, jungle_planks, jungle_planks, book, book, book, jungle_planks, jungle_planks, jungle_planks);
-recipe.add(1, "km:bookshelf_spruce", spruce_planks, spruce_planks, spruce_planks, book, book, book, spruce_planks, spruce_planks, spruce_planks);
-recipe.add(1, "km:copper_block", copper_ingot, copper_ingot, copper_ingot, copper_ingot, copper_ingot, copper_ingot, copper_ingot, copper_ingot, copper_ingot);
-recipe.add(1, "km:bronze_block", bronze_ingot, bronze_ingot, bronze_ingot, bronze_ingot, bronze_ingot, bronze_ingot, bronze_ingot, bronze_ingot, bronze_ingot);
-recipe.add(1, "km:tin_block", tin_ingot, tin_ingot, tin_ingot, tin_ingot, tin_ingot, tin_ingot, tin_ingot, tin_ingot, tin_ingot);
-recipe.add(1, "km:silver_block", silver_ingot, silver_ingot, silver_ingot, silver_ingot, silver_ingot, silver_ingot, silver_ingot, silver_ingot, silver_ingot);
-recipe.add(1, "km:cooking_pot_copper", copper_ingot, air, copper_ingot, copper_ingot, air, copper_ingot, copper_ingot, copper_ingot, copper_ingot);
-recipe.add(1, bronze_ingot, tin_ingot, copper_ingot, copper_ingot, copper_ingot, copper_ingot, copper_ingot, copper_ingot, copper_ingot, copper_ingot);
-recipe.add(1, copper_ingot, air, air, air, air, "km:copper_ore", air, air, air, air);
-recipe.add(1, tin_ingot, air, air, air, air, "km:tin_ore", air, air, air, air);
-recipe.add(1, silver_ingot, air, air, air, air, "km:silver_ore", air, air, air, air);
-recipe.add(1, "km:spikes_bronze", air, bronze_ingot, air, bronze_ingot, bronze_ingot, bronze_ingot, air, air, air);
-recipe.add(1, "km:spikes_copper", air, copper_ingot, air, copper_ingot, copper_ingot, copper_ingot, air, air, air);
-recipe.add(1, "km:spikes_gold", air, gold_ingot, air, gold_ingot, gold_ingot, gold_ingot, air, air, air);
-recipe.add(1, "km:spikes_iron", air, iron_ingot, air, iron_ingot, iron_ingot, iron_ingot, air, air, air);
-recipe.add(1, "km:wooden_battleaxe", air, planks, planks, air, stick, planks, stick, air, air);
-recipe.add(1, "km:stone_battleaxe", air, cobblestone, cobblestone, air, stick, cobblestone, stick, air, air);
-recipe.add(1, "km:iron_battleaxe", air, iron_ingot, iron_ingot, air, stick, iron_ingot, stick, air, air);
-recipe.add(1, "km:golden_battleaxe", air, gold_ingot, gold_ingot, air, stick, gold_ingot, stick, air, air);
-recipe.add(1, "km:diamond_battleaxe", air, diamond, diamond, air, stick, diamond, stick, air, air);
-recipe.add(1, "km:copper_battleaxe", air, copper_ingot, copper_ingot, air, stick, copper_ingot, stick, air, air);
-recipe.add(1, "km:bronze_battleaxe", air, bronze_ingot, bronze_ingot, air, stick, bronze_ingot, stick, air, air);
-recipe.add(1, "km:copper_axe", air, copper_ingot, copper_ingot, air, copper_ingot, stick, air, air, stick);
-recipe.add(1, "km:bronze_axe", air, bronze_ingot, bronze_ingot, air, bronze_ingot, stick, air, air, stick);
-recipe.add(1, "km:wooden_dagger", air, air, planks, air, stick, air, air, air, air);
-recipe.add(1, "km:stone_dagger", air, air, cobblestone, air, stick, air, air, air, air);
-recipe.add(1, "km:iron_dagger", air, air, iron_ingot, air, stick, air, air, air, air);
-recipe.add(1, "km:golden_dagger", air, air, gold_ingot, air, stick, air, air, air, air);
-recipe.add(1, "km:diamond_dagger", air, air, diamond, air, stick, air, air, air, air);
-recipe.add(1, "km:copper_dagger", air, air, copper_ingot, air, stick, air, air, air, air);
-recipe.add(1, "km:bronze_dagger", air, air, bronze_ingot, air, stick, air, air, air, air);
-recipe.add(1, "km:copper_hoe", air, copper_ingot, copper_ingot, air, air, stick, air, air, stick);
-recipe.add(1, "km:bronze_hoe", air, bronze_ingot, bronze_ingot, air, air, stick, air, air, stick);
-recipe.add(1, "km:wooden_hammer", planks, planks, planks, planks, stick, planks, air, stick, air);
-recipe.add(1, "km:stone_hammer", cobblestone, cobblestone, cobblestone, cobblestone, stick, cobblestone, air, stick, air);
-recipe.add(1, "km:iron_hammer", iron_ingot, iron_ingot, iron_ingot, iron_ingot, stick, iron_ingot, air, stick, air);
-recipe.add(1, "km:golden_hammer", gold_ingot, gold_ingot, gold_ingot, gold_ingot, stick, gold_ingot, air, stick, air);
-recipe.add(1, "km:diamond_hammer", diamond, diamond, diamond, diamond, stick, diamond, air, stick, air);
-recipe.add(1, "km:copper_hammer", copper_ingot, copper_ingot, copper_ingot, copper_ingot, stick, copper_ingot, air, stick, air);
-recipe.add(1, "km:bronze_hammer", bronze_ingot, bronze_ingot, bronze_ingot, bronze_ingot, stick, bronze_ingot, air, stick, air);
-recipe.add(1, "km:copper_shovel", air, copper_ingot, air, air, stick, air, air, stick, air);
-recipe.add(1, "km:bronze_shovel", air, bronze_ingot, air, air, stick, air, air, stick, air);
-recipe.add(1, "km:wooden_scepter", air, stick, planks, air, stick, stick, stick, air, air);
-recipe.add(1, "km:stone_scepter", air, stick, cobblestone, air, stick, stick, stick, air, air);
-recipe.add(1, "km:iron_scepter", air, stick, iron_ingot, air, stick, stick, stick, air, air);
-recipe.add(1, "km:golden_scepter", air, stick, gold_ingot, air, stick, stick, stick, air, air);
-recipe.add(1, "km:diamond_scepter", air, stick, diamond, air, stick, stick, stick, air, air);
-recipe.add(1, "km:copper_scepter", air, stick, copper_ingot, air, stick, stick, stick, air, air);
-recipe.add(1, "km:bronze_scepter", air, stick, bronze_ingot, air, stick, stick, stick, air, air);
-recipe.add(1, "km:copper_pickaxe", copper_ingot, copper_ingot, copper_ingot, air, stick, air, air, stick, air);
-recipe.add(1, "km:bronze_pickaxe", bronze_ingot, bronze_ingot, bronze_ingot, air, stick, air, air, stick, air);
-recipe.add(1, "km:wooden_stick", air, air, planks, air, stick, air, planks, air, air);
-recipe.add(1, "km:stone_stick", air, air, cobblestone, air, stick, air, cobblestone, air, air);
-recipe.add(1, "km:iron_stick", air, air, iron_ingot, air, stick, air, iron_ingot, air, air);
-recipe.add(1, "km:golden_stick", air, air, gold_ingot, air, stick, air, gold_ingot, air, air);
-recipe.add(1, "km:diamond_stick", air, air, diamond, air, stick, air, diamond, air, air);
-recipe.add(1, "km:copper_stick", air, air, copper_ingot, air, stick, air, copper_ingot, air, air);
-recipe.add(1, "km:bronze_stick", air, air, bronze_ingot, air, stick, air, bronze_ingot, air, air);
-recipe.add(1, "km:copper_sword", air, copper_ingot, air, air, copper_ingot, air, air, stick, air);
-recipe.add(1, "km:bronze_sword", air, bronze_ingot, air, air, bronze_ingot, air, air, stick, air);
-recipe.add(1, "km:mushroom_stick_raw", air, "minecraft:brown_mushroom", "minecraft:brown_mushroom", air, stick, "minecraft:red_mushroom", air, air, air);
-recipe.add(1, "km:mushroom_stick_cooked", air, air, air, air, "km:mushroom_stick_raw", air, air, air, air);
-recipe.add(1, "km:fried_egg", air, air, air, air, "minecraft:egg", air, air, air, air);
-recipe.add(1, "km:crate_acacia", acacia_planks, acacia_planks, acacia_planks, acacia_planks, acacia_planks, acacia_planks, acacia_planks, acacia_planks, acacia_planks);
-recipe.add(1, "km:crate_birch", birch_planks, birch_planks, birch_planks, birch_planks, birch_planks, birch_planks, birch_planks, birch_planks, birch_planks);
-recipe.add(1, "km:crate_big_oak", dark_oak_planks, dark_oak_planks, dark_oak_planks, dark_oak_planks, dark_oak_planks, dark_oak_planks, dark_oak_planks, dark_oak_planks, dark_oak_planks);
-recipe.add(1, "km:crate_oak", planks, planks, planks, planks, planks, planks, planks, planks, planks);
-recipe.add(1, "km:crate_jungle", jungle_planks, jungle_planks, jungle_planks, jungle_planks, jungle_planks, jungle_planks, jungle_planks, jungle_planks, jungle_planks);
-recipe.add(1, "km:crate_spruce", spruce_planks, spruce_planks, spruce_planks, spruce_planks, spruce_planks, spruce_planks, spruce_planks, spruce_planks, spruce_planks);
-recipe.add(1, "km:coarse_dirt_slab", air, air, air, coarse_dirt, coarse_dirt, coarse_dirt, air, air, air);
-recipe.add(1, "km:gravel_slab", air, air, air, gravel, gravel, gravel, air, air, air);
-recipe.add(1, "km:straw_hat", air, wheat, air, wheat, wheat, wheat, air, air, air);
-recipe.add(1, hay_bundle, grass, grass, grass, grass, grass, grass, grass, grass, grass);
-recipe.add(1, real_hay_block, hay_bundle, hay_bundle, hay_bundle, hay_bundle, hay_bundle, hay_bundle, hay_bundle, hay_bundle, hay_bundle);
-recipe.add(1, "km:real_hay_bed", air, air, air, real_hay_block, real_hay_block, real_hay_block, air, air, air);
-recipe.add(1, "km:lantern", iron_nugget, iron_nugget, iron_nugget, "minecraft:glass_pane", "minecraft:torch", "minecraft:glass_pane", iron_nugget, iron_nugget, iron_nugget);
-recipe.add(1, "km:sling", stick, string, stick, stick, air, stick, air, stick, air);
-recipe.add(4, "minecraft:string", air, air, air, air, "minecraft:white_wool", air, air, air, air);
-recipe.add(4, "km:cloth_helmet", cloth, cloth, cloth, cloth, air, cloth, air, air, air);
-recipe.add(4, "km:cloth_chestplate", cloth, air, cloth, cloth, cloth, cloth, cloth, cloth, cloth);
-recipe.add(4, "km:cloth_leggings", cloth, cloth, cloth, cloth, air, cloth, cloth, air, cloth);
-recipe.add(4, "km:cloth_boots", cloth, air, cloth, cloth, air, cloth, air, air, air);
-
-msg("dev", "§bRecipes §rloaded.");
-@wait
-wait();
-if(event == "entity_click") {
-	if(hand == "OFF_HAND") {
-		goto("wait");
-	}
-	if(entity.getType(entity) != "human") {
-		goto("wait");
-	}
-	if(entity.getName(entity) == "Recipes") {
-		recipe_menu = inv.new("333333333333333333333333333333333333333333333200000022");
-		recipe.setPage(player, recipe_menu, 1);
-		inv.open(recipe_menu, player, "Recipes");
-	}
-	goto("wait");
-}
-if(event == "inv_click") {
-	if(inv_name == "Recipes") {
-		item_type = item.getType(item);
-		if(item_type == "minecraft:air") {
-			goto("wait");
-		}
-		if(item_type == "km:return_red") {
-			page = map.getOrDefault($recipe_site_map, player.getUuid(player), 1);
-			recipe.setPage(player, inv, page);
-			goto("wait");
-		}
-		if(item_type == "minecraft:paper") {
-			name = item.getName(item);
-			if(text.contains(name, "<<") || text.contains(name, ">>")) {
-				page = removeFormat(name);
-				page = text.replace(page, "<<", "");
-				page = text.replace(page, ">>", "");
-				page = read.number(page);
-				if(inv_slot == 46) {
-					recipe.setPage(player, inv, page);
-				}
-				if(inv_slot == 47) {
-					recipe.setPage(player, inv, page);
-				}
-				goto("wait");
-			}
-		}
-		index = recipe.getIndexFromItemType(item_type);
-		if(index == null) {
-			goto("wait");
-		}
-		recipe.showRecipe(player, inv, index);
-	}
-}
-goto("wait");
-
-function recipe.add(result_amount, result_item, item1, item2, item3, item4, item5, item6, item7, item8, item9) {
-	array = array.new(11);
-	array[0] = result_amount;
-	array[1] = result_item;
-	array[2] = item1;
-	array[3] = item2;
-	array[4] = item3;
-	array[5] = item4;
-	array[6] = item5;
-	array[7] = item6;
-	array[8] = item7;
-	array[9] = item8;
-	array[10] = item9;
-	list.add($items_list, array);
-}
-
-function recipe.getIndexFromItemType(item_type) {
-	for(i = 0; i < list.getSize($items_list); i++) {
-		array = list.getIndex($items_list, i);
-		if(array[1] == item_type) {
-			return i;
-		}
-	}
-	return null;
-}
-
-function recipe.showRecipe(player, menu, index) {
-	for(i = 0; i < 48; i++) {
-		inv.setItem(menu, i, $air_item);
-	}
-	array = list.getIndex($items_list, index);
-	inv.setItem(menu, 23, read.item("km:arrow_right"));
-	inv.setItem(menu, 45, read.item("km:return_red", 1, "§fReturn to overview"));
-	inv.setItem(menu, 10, read.item(array[2]));
-	inv.setItem(menu, 11, read.item(array[3]));
-	inv.setItem(menu, 12, read.item(array[4]));
-	inv.setItem(menu, 19, read.item(array[5]));
-	inv.setItem(menu, 20, read.item(array[6]));
-	inv.setItem(menu, 21, read.item(array[7]));
-	inv.setItem(menu, 28, read.item(array[8]));
-	inv.setItem(menu, 29, read.item(array[9]));
-	inv.setItem(menu, 30, read.item(array[10]));
-	inv.setItem(menu, 25, read.item(array[1], array[0]));
-	inv.update(player);
-}
-
-function recipe.setPage(player, menu, page) {
-	map.add($recipe_site_map, player.getUuid(player), page);
-	size = list.getSize($items_list);
-	max_page = math.roundUp(size / 45);
-	if(page > max_page) {
-		return;
-	}
-	inv.setItem(menu, 45, $air_item);
-	if(page > 1) {
-		inv.setItem(menu, 46, read.item("minecraft:paper", 1, concat("§e", text.number(page - 1), " <<")));
-	} else {
-		inv.setItem(menu, 46, $air_item);
-	}
-	if(page < max_page) {
-		inv.setItem(menu, 47, read.item("minecraft:paper", 1, concat("§e>> ", text.number(page + 1))));
-	} else {
-		inv.setItem(menu, 47, $air_item);
-	}
-	max_index = size - 1;
-	for(i = 0; i < 45; i++) {
-		list_index = i + 45 * (page - 1);
-		if(list_index > max_index) {
-			inv.setItem(menu, i, $air_item);
-		} else {
-			array = list.getIndex($items_list, list_index);
-			inv.setItem(menu, i, read.item(array[1]));
-		}
-	}
-	inv.update(player);
-}

+ 3 - 83
system/commands.txt

@@ -4961,48 +4961,15 @@ goto("datatoolshelp");
 if(size == 0) {
 	@humanhelp
 	msg.prefix(player, prefix_human, "/human ...");
-	msg.string(player, string.concat("§6 - spawn <name> §rSpawns a human"));
-	msg.string(player, string.concat("§6 - set <uuid> §rSets the skin of a human"));
-	msg.string(player, string.concat("§6 - skin <name> §rSets the skin of a human"));
-	msg.string(player, string.concat("§6 - name §rSets the name of a human"));
-	msg.string(player, string.concat("§6 - move <true/false> §rSets if can move"));
-	msg.string(player, string.concat("§6 - ai <value> §rSets the ai of a human"));
-	msg.string(player, string.concat("§6 - remove §rRemoves a human"));
+	msg.string(player, string.concat("§6 - skin <name> §rSets the skin of a citizen"));
 	goto("wait");
 }
 arg0 = string.toLowerCase(list.getIndex(args, 0));
-if(arg0 == "spawn") {
-	if(size < 2) {
-		msg.prefix(player, prefix_human, "/human spawn <name>.");
-		goto("wait");
-	}
-	name = list.getIndex(args, 1);
-	for(i = 2; i < list.getSize(args); i++) {
-	    name = string.concat(name, " ", list.getIndex(args, i));
-	}
-	human.spawn(entity.getLocation(player), name);
-	msg.action(player, "Human spawned.");
-	goto("wait");
-}
-human = player.getTargetEntity(player, 5);
 citizen = player.getTargetCitizen(player, 5);
-if(!entity.isHuman(human) && !isCitizen(citizen)) {
-	msg.prefix(player, prefix_human, "No human or citizen.");
+if(!isCitizen(citizen)) {
+	msg.prefix(player, prefix_human, "No citizen.");
 	goto("wait");	
 }
-if(arg0 == "set") {
-	if(size == 2) {
-		name = list.getIndex(args, 1);
-		uuid = read.uuid(name);
-		if(uuid == null) {
-		    msg.action(player, "Invalid UUID.");
-	        goto("wait");	
-		}
-		human.setSkinUUID(human, uuid);
-		msg.action(player, "Skin set.");
-		goto("wait");
-	}
-}
 elseif(arg0 == "skin") {
 	if(size == 2) {
 		name = string.toLowerCase(list.getIndex(args, 1));
@@ -5056,53 +5023,6 @@ elseif(arg0 == "skin") {
 		goto("wait");
 	}
 }
-elseif(arg0 == "name") {
-	if(size < 2) {
-		msg.prefix(player, prefix_human, "/human name <name>.");
-		goto("wait");
-	}
-	name = list.getIndex(args, 1);
-	for(i = 2; i < list.getSize(args); i++) {
-	    name = string.concat(name, " ", list.getIndex(args, i));
-	}
-	name = string.replace(name, "&", "§");
-	human.setName(human, name);
-	msg.action(player, string.concat("Human named to ", name, "§r."));
-	goto("wait");
-}
-if(arg0 == "move") {
-	if(size < 2) {
-		msg.prefix(player, prefix_human, "/human move <true/false>");
-		goto("wait");
-	}
-	bool = list.getIndex(args, 1);
-	if(bool != true && bool != false) {
-		msg.action(player, "True/False expected.");
-		goto("wait");
-	}
-	human.canMove(human, bool);
-	msg.action(player, "Move set.");
-	goto("wait");
-}
-if(arg0 == "ai") {
-	if(size < 2) {
-		msg.prefix(player, prefix_human, "/human ai <value>");
-		goto("wait");
-	}
-	value = list.getIndex(args, 1);
-	if(!isDouble(value) || value < 0 || value > 2) {
-		msg.action(player, "Number between 0 and 2 expected.");
-		goto("wait");
-	}
-	human.setAi(human, value);
-	msg.action(player, "Ai set.");
-	goto("wait");
-}
-elseif(arg0 == "remove") {
-	entity.remove(human);
-	msg.action(player, "Human removed.");
-	goto("wait");
-}
 goto("humanhelp");
 
 @answer

+ 1 - 1
system/damage.txt

@@ -74,7 +74,7 @@ function updateEntityName(entity) {
 	}
 	living_entity = entity;
 	entity_type = entity.getType(living_entity);
-	if(entity_type == "armor_stand" || entity_type == "human") {
+	if(entity_type == "armor_stand" || isCitizen(entity)) {
 		return;
 	}
 

+ 0 - 3
system/init.txt

@@ -73,7 +73,4 @@ table.setsize(string.fromCode(63500), 9);
 table.setEmpty1(string.concat(string.fromCode(63502), " "));
 table.setEmpty2(string.concat(string.fromCode(63501), " "));
 
-human.setPrefix("§d§oNPC §e| §7§o");
-human.setSuffix("");
-
 term();

+ 0 - 22
utils/u_cmdhelp.txt

@@ -490,14 +490,6 @@ function setCommandHelps() {
 	command.addHelp(help);
 	
 	help = command.newHelp("human", "human");
-	//human spawn
-	helpArg0 = command.newHelpLiteral("spawn");
-	command.addHelpChild(helpArg0, command.newHelpString("name", true));
-	command.addHelpChild(help, helpArg0);
-	//human set <name>
-	helpArg0 = command.newHelpLiteral("set");
-	command.addHelpChild(helpArg0, command.newHelpString("uuid", false));
-	command.addHelpChild(help, helpArg0);
 	//human skin <name>
 	helpArg0 = command.newHelpLiteral("skin");
 	command.addHelpChild(helpArg0, command.newHelpLiteral("alena"));
@@ -523,20 +515,6 @@ function setCommandHelps() {
 	command.addHelpChild(helpArg0, command.newHelpLiteral("santa_marv"));
 	command.addHelpChild(helpArg0, command.newHelpLiteral("smith"));
 	command.addHelpChild(help, helpArg0);
-	//human name
-	helpArg0 = command.newHelpLiteral("name");
-	command.addHelpChild(helpArg0, command.newHelpString("name", true));
-	command.addHelpChild(help, helpArg0);
-	//human move <true/fals>
-	helpArg0 = command.newHelpLiteral("move");
-	command.addHelpChild(helpArg0, command.newHelpBool("boolean"));
-	command.addHelpChild(help, helpArg0);
-	//human ai <value>
-	helpArg0 = command.newHelpLiteral("ai");
-	command.addHelpChild(helpArg0, command.newHelpInt("value", 0, 20));
-	command.addHelpChild(help, helpArg0);
-	//human kill
-	command.addHelpChild(help, command.newHelpLiteral("remove"));
 	command.addHelp(help);
 	
 	help = command.newHelp("mail", "mail");

+ 0 - 7
utils/u_general.txt

@@ -1702,13 +1702,6 @@ function drops.containsMaterial(drops_list, material) {
 //Entity-Utils
 //--------------------------------------------------
 
-function entity.isHuman(entity) { //Deprecated
-	if(entity == null) {
-		return false;
-	}
-	return entity.getType(entity) == "human";
-}
-
 function entity.isArmorstand(entity) {
 	if(entity == null) {
 		return false;