diff --git a/game.conf b/game.conf index 773ce33..3f1e1cc 100644 --- a/game.conf +++ b/game.conf @@ -1,3 +1,7 @@ -title = Insane Protestor -author = MCL +title = Insane Protestor +author = MCL description = A game about a man who protests his country's government in a violent and somewhat unreasonable way. +allowed_mapgens = singlenode +disabled_settings = !enable_damage, creative_mode, enable_server + + diff --git a/menu/background.png b/menu/background.png index 576fc9b..62434c4 100644 Binary files a/menu/background.png and b/menu/background.png differ diff --git a/mods/cops/init.lua b/mods/cops/init.lua index a6142e4..9fe4365 100644 --- a/mods/cops/init.lua +++ b/mods/cops/init.lua @@ -19,8 +19,7 @@ minetest.register_abm({ chance = 5, -- One node has a chance of 1 in 50 to get selected action = function(pos, node, active_object_count, active_object_count_wider) minetest.add_entity(pos, "cops:cop_regular_female") - end -})]] + end})]] -- Cops mobs:register_mob("cops:cop_regular_female", { diff --git a/mods/destruction_counter/init.lua b/mods/destruction_counter/init.lua index 691936a..ae78f68 100644 --- a/mods/destruction_counter/init.lua +++ b/mods/destruction_counter/init.lua @@ -10,32 +10,35 @@ minetest.register_on_joinplayer(function(player) meta = player:get_meta() - idText = player:hud_add({ - hud_elem_type = "text", - position = {x = .5, y = .5}, - offset = {x = 0, y = 0}, - text = nodesDestroyed, - alignment = {x = 0, y = 0}, -- center aligned - scale = {x = 100, y = 100}, -- covered later - }) + player:hud_add({ hud_elem_type = "image", - position = {x = 1, y = .5}, - offset = {x = -515, y = 23}, - text = "destruction_counter_meter_empty.png", - scale = {x = 4, y = 4}, + position = {x = .8, y = .85}, + offset = {x = -830, y = 23}, + text = "destruction_counter_meter_empty.png", + scale = {x = 4, y = 4}, alignment = {x = 1, y = 0}, }) idMeter = player:hud_add({ hud_elem_type = "image", - position = {x = 1, y = .5}, - offset = {x = -510, y = 23}, - text = "destruction_counter_meter_full.png", - scale = {x = 0, y = 4}, + position = {x = .8, y = .85}, + offset = {x = -830, y = 23}, + text = "destruction_counter_meter_full.png", + scale = {x = 0, y = 4}, alignment = {x = 1, y = 0}, }) + + idText = player:hud_add({ + hud_elem_type = "text", + position = {x = 0.3, y = 0.7}, + scale = {x = 0.3, y = 0.5}, + text = "Test", + number = 0xff3c0a, + alignment = {x = 1}, + offset = {x = 0, y = 46}, + }) end) minetest.register_on_dignode(function(pos, oldnode, digger) diff --git a/mods/explosives/init.lua b/mods/explosives/init.lua index 818c987..cb1bfcb 100644 --- a/mods/explosives/init.lua +++ b/mods/explosives/init.lua @@ -346,7 +346,7 @@ local function tnt_explode(pos, radius, ignore_protection, ignore_on_blast, owne -- What I'm trying to do is to make the explosions only affect nodes that are in a specific group - if cid ~= c_air and cid ~= c_ignore and minetest.get_item_group(minetest.get_name_from_content_id(cid), "cracky") < 2 then + if cid ~= c_air and cid ~= c_ignore and minetest.get_item_group(minetest.get_name_from_content_id(cid), "cracky") > 2 then data[vi] = destroy(drops, p, cid, c_air, c_fire, on_blast_queue, on_construct_queue, ignore_protection, ignore_on_blast, owner) destruction_counter.nodesDestroyed = destruction_counter.nodesDestroyed + 1 destruction_counter.updateCounter(owner) diff --git a/mods/main/nodes.lua b/mods/main/nodes.lua index 198dc5e..8de581d 100644 --- a/mods/main/nodes.lua +++ b/mods/main/nodes.lua @@ -156,7 +156,7 @@ minetest.register_node("main:glass", paramtype = "light", sunlight_propagates = true, is_ground_content = false, - groups = {cracky = 1, oddly_breakable_by_hand = 1}, + groups = {cracky = 4, oddly_breakable_by_hand = 1}, }) --Ores diff --git a/mods/main/tools.lua b/mods/main/tools.lua index 384db70..b43d95f 100644 --- a/mods/main/tools.lua +++ b/mods/main/tools.lua @@ -8,9 +8,7 @@ minetest.register_item(":", { groupcaps = { - oddly_breakable_by_hand = {times={[1]=3.50,[2]=2.00,[3]=0.70}, uses=0}, - snappy = {times={[3]=1.00}, uses=0, maxlevel=1}, - crumbly = {times={[2]=4.50, [3]=1.80}, uses=0, maxlevel=1}, + cracky = {times={[4]=.4}, uses=0, maxlevel=4}, }, damage_groups = {fleshy = 3, snappy = 2}, } diff --git a/mods/roads/streetsawards/depends.txt b/mods/roads/streetsawards/depends.txt deleted file mode 100644 index 42d368b..0000000 --- a/mods/roads/streetsawards/depends.txt +++ /dev/null @@ -1,2 +0,0 @@ -streetsmod -awards? \ No newline at end of file diff --git a/mods/roads/streetsawards/init.lua b/mods/roads/streetsawards/init.lua deleted file mode 100644 index fedc768..0000000 --- a/mods/roads/streetsawards/init.lua +++ /dev/null @@ -1,22 +0,0 @@ -if streets.extendedBy.awards == true then - awards.register_achievement("award_countryroads",{ - title = "Roadbuilder", - description = "You built some quite big roads!", - icon = "novicebuilder.png", - trigger = { - type = "place", - node = "streets:asphalt", - target = 175, - }, - }) - awards.register_achievement("award_underworld",{ - title = "Start your sewers!", - description = "You placed your first manhole! Did you know that you can open it with a right-click?", - icon = "novicebuilder.png", - trigger = { - type = "place", - node = "streets:manhole_adv_closed", - target = 1, - }, - }) -end \ No newline at end of file diff --git a/mods/sethome/README.txt b/mods/sethome/README.txt deleted file mode 100644 index 6f0a282..0000000 --- a/mods/sethome/README.txt +++ /dev/null @@ -1,7 +0,0 @@ -Minetest Game mod: sethome -========================== -See license.txt for license information. - -Authors of source code ----------------------- -sfan5 (MIT) diff --git a/mods/sethome/init.lua b/mods/sethome/init.lua deleted file mode 100644 index 9fc8e6a..0000000 --- a/mods/sethome/init.lua +++ /dev/null @@ -1,107 +0,0 @@ --- sethome/init.lua - -sethome = {} - --- Load support for MT game translation. -local S = minetest.get_translator("sethome") - - -local homes_file = minetest.get_worldpath() .. "/homes" -local homepos = {} - -local function loadhomes() - local input = io.open(homes_file, "r") - if not input then - return -- no longer an error - end - - -- Iterate over all stored positions in the format "x y z player" for each line - for pos, name in input:read("*a"):gmatch("(%S+ %S+ %S+)%s([%w_-]+)[\r\n]") do - homepos[name] = minetest.string_to_pos(pos) - end - input:close() -end - -loadhomes() - -sethome.set = function(name, pos) - local player = minetest.get_player_by_name(name) - if not player or not pos then - return false - end - local player_meta = player:get_meta() - player_meta:set_string("sethome:home", minetest.pos_to_string(pos)) - - -- remove `name` from the old storage file - if not homepos[name] then - return true - end - local data = {} - local output = io.open(homes_file, "w") - if output then - homepos[name] = nil - for i, v in pairs(homepos) do - table.insert(data, string.format("%.1f %.1f %.1f %s\n", v.x, v.y, v.z, i)) - end - output:write(table.concat(data)) - io.close(output) - return true - end - return true -- if the file doesn't exist - don't return an error. -end - -sethome.get = function(name) - local player = minetest.get_player_by_name(name) - local player_meta = player:get_meta() - local pos = minetest.string_to_pos(player_meta:get_string("sethome:home")) - if pos then - return pos - end - - -- fetch old entry from storage table - pos = homepos[name] - if pos then - return vector.new(pos) - else - return nil - end -end - -sethome.go = function(name) - local pos = sethome.get(name) - local player = minetest.get_player_by_name(name) - if player and pos then - player:set_pos(pos) - return true - end - return false -end - -minetest.register_privilege("home", { - description = S("Can use /sethome and /home"), - give_to_singleplayer = false -}) - -minetest.register_chatcommand("home", { - description = S("Teleport you to your home point"), - privs = {home = true}, - func = function(name) - if sethome.go(name) then - return true, S("Teleported to home!") - end - return false, S("Set a home using /sethome") - end, -}) - -minetest.register_chatcommand("sethome", { - description = S("Set your home point"), - privs = {home = true}, - func = function(name) - name = name or "" -- fallback to blank name if nil - local player = minetest.get_player_by_name(name) - if player and sethome.set(name, player:get_pos()) then - return true, S("Home set!") - end - return false, S("Player not found!") - end, -}) diff --git a/mods/sethome/license.txt b/mods/sethome/license.txt deleted file mode 100644 index 09f03b0..0000000 --- a/mods/sethome/license.txt +++ /dev/null @@ -1,24 +0,0 @@ -License of source code ----------------------- - -The MIT License (MIT) -Copyright (C) 2014-2016 sfan5 - -Permission is hereby granted, free of charge, to any person obtaining a copy of this -software and associated documentation files (the "Software"), to deal in the Software -without restriction, including without limitation the rights to use, copy, modify, merge, -publish, distribute, sublicense, and/or sell copies of the Software, and to permit -persons to whom the Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all copies or -substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, -INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR -PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE -FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR -OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -DEALINGS IN THE SOFTWARE. - -For more details: -https://opensource.org/licenses/MIT diff --git a/mods/sethome/locale/sethome.de.tr b/mods/sethome/locale/sethome.de.tr deleted file mode 100644 index 46279dd..0000000 --- a/mods/sethome/locale/sethome.de.tr +++ /dev/null @@ -1,8 +0,0 @@ -# textdomain: sethome -Can use /sethome and /home=Kann /sethome und /home benutzen -Teleport you to your home point=Teleportieren Sie sich zu Ihrem Zuhause-Punkt -Teleported to home!=Nach Hause teleportiert! -Set a home using /sethome=Ein Zuhause mit /sethome setzen -Set your home point=Ihren Zuhause-Punkt setzen -Home set!=Zuhause gesetzt! -Player not found!=Spieler nicht gefunden! diff --git a/mods/sethome/locale/sethome.eo.tr b/mods/sethome/locale/sethome.eo.tr deleted file mode 100644 index eb8f0a6..0000000 --- a/mods/sethome/locale/sethome.eo.tr +++ /dev/null @@ -1,8 +0,0 @@ -# textdomain: sethome -Can use /sethome and /home=Povas uzi /sethome kaj /home -Teleport you to your home point=Teletransporti vin al via hejmo -Teleported to home!=Teletransportita al hejmo! -Set a home using /sethome=Fiksi hejmon per /sethome -Set your home point=Fiksi vian hejman punkton -Home set!=Fiksita hejmo! -Player not found!=Ludanto ne troveblas! diff --git a/mods/sethome/locale/sethome.es.tr b/mods/sethome/locale/sethome.es.tr deleted file mode 100644 index 7c04ee3..0000000 --- a/mods/sethome/locale/sethome.es.tr +++ /dev/null @@ -1,8 +0,0 @@ -# textdomain: sethome -Can use /sethome and /home=Puedes usar /sethome y /home -Teleport you to your home point=Teletranspórtate a tu hogar -Teleported to home!=¡Teletransportado a tu hogar! -Set a home using /sethome=Establece tu hogar usando /sethome -Set your home point=Establece el sitio de tu hogar -Home set!=¡Hogar establecido! -Player not found!=¡Jugador no encontrado! diff --git a/mods/sethome/locale/sethome.fr.tr b/mods/sethome/locale/sethome.fr.tr deleted file mode 100644 index 852621d..0000000 --- a/mods/sethome/locale/sethome.fr.tr +++ /dev/null @@ -1,8 +0,0 @@ -# textdomain: sethome -Can use /sethome and /home=Peut utiliser /sethome et /home -Teleport you to your home point=Vous téléporter à votre domicile -Teleported to home!=Téléporté à votre domicile ! -Set a home using /sethome=Définir un domicile en utilisant /sethome -Set your home point=Définir votre domicile -Home set!=Domicile défini ! -Player not found!=Joueur non trouvé ! diff --git a/mods/sethome/locale/sethome.id.tr b/mods/sethome/locale/sethome.id.tr deleted file mode 100644 index 1966978..0000000 --- a/mods/sethome/locale/sethome.id.tr +++ /dev/null @@ -1,8 +0,0 @@ -# textdomain: sethome -Can use /sethome and /home=Boleh pakai /sethome dan /home -Teleport you to your home point=Teleportasi ke rumah Anda -Teleported to home!=Teleportasi ke rumah! -Set a home using /sethome=Atur letak rumah dengan /sethome -Set your home point=Atur letak rumah -Home set!=Letak rumah diatur! -Player not found!=Pemain tidak ditemukan! diff --git a/mods/sethome/locale/sethome.it.tr b/mods/sethome/locale/sethome.it.tr deleted file mode 100644 index 6bdf11c..0000000 --- a/mods/sethome/locale/sethome.it.tr +++ /dev/null @@ -1,8 +0,0 @@ -# textdomain: sethome -Can use /sethome and /home=Può usare /sethome e /home -Teleport you to your home point=Ti teletrasporta al tuo punto di domicilio -Teleported to home!=Teletrasportato a casa! -Set a home using /sethome=Imposta un domicilio usando /sethome -Set your home point=Imposta il tuo punto di domicilio -Home set!=Domicilio impostato! -Player not found!=Giocatore non trovato! diff --git a/mods/sethome/locale/sethome.ja.tr b/mods/sethome/locale/sethome.ja.tr deleted file mode 100644 index 3d636b5..0000000 --- a/mods/sethome/locale/sethome.ja.tr +++ /dev/null @@ -1,8 +0,0 @@ -# textdomain: sethome -Can use /sethome and /home=/sethomeと/homeが使えます -Teleport you to your home point=ホーム地点にテレポートします -Teleported to home!=ホームにテレポート！ -Set a home using /sethome=/sethomeを使ってホームを設定します -Set your home point=ホーム地点を設定します -Home set!=ホーム地点をセット！ -Player not found!=プレーヤーが見つかりません！ diff --git a/mods/sethome/locale/sethome.jbo.tr b/mods/sethome/locale/sethome.jbo.tr deleted file mode 100644 index 90ac1a3..0000000 --- a/mods/sethome/locale/sethome.jbo.tr +++ /dev/null @@ -1,8 +0,0 @@ -# textdomain: sethome -Can use /sethome and /home=kakne lo nu pilno lo me zoi gy./sethome.gy. ku .e lo me zoi gy./home.gy. -Teleport you to your home point=sukmu'u lo do zdani mokca -Teleported to home!=puba'o sukmu'u lo zdani -Set a home using /sethome=ko tcimi'e fi lo zdani sepi'o lo me zoi gy./sethome.gy. -Set your home point=tcimi'e fi lo do zdani mokca -Home set!=puba'o tcimi'e fi lo zdani -Player not found!=lo kelci na te facki diff --git a/mods/sethome/locale/sethome.ms.tr b/mods/sethome/locale/sethome.ms.tr deleted file mode 100644 index 7e9ec76..0000000 --- a/mods/sethome/locale/sethome.ms.tr +++ /dev/null @@ -1,8 +0,0 @@ -# textdomain: sethome -Can use /sethome and /home=Boleh guna /sethome dan /home -Teleport you to your home point=Teleportasikan anda ke titik rumah anda -Teleported to home!=Diteleportasikan ke rumah! -Set a home using /sethome=Tetapkan rumah menggunakan /sethome -Set your home point=Tetapkan titik rumah anda -Home set!=Rumah ditetapkan! -Player not found!=Pemain tidak dijumpai! diff --git a/mods/sethome/locale/sethome.pl.tr b/mods/sethome/locale/sethome.pl.tr deleted file mode 100644 index 981a8c4..0000000 --- a/mods/sethome/locale/sethome.pl.tr +++ /dev/null @@ -1,8 +0,0 @@ -# textdomain: sethome -Can use /sethome and /home=Może używać /sethome i /home -Teleport you to your home point=Teleportuj się do swojego punktu domowego -Teleported to home!=Teleportowano do punktu domowego -Set a home using /sethome=Ustaw punkt domowy używając /sethome -Set your home point=Ustaw swój punkt domowy -Home set!=Punkt domowy ustawiony! -Player not found!=Gracz nie odnaleziony! diff --git a/mods/sethome/locale/sethome.pt_BR.tr b/mods/sethome/locale/sethome.pt_BR.tr deleted file mode 100644 index fe2c35c..0000000 --- a/mods/sethome/locale/sethome.pt_BR.tr +++ /dev/null @@ -1,8 +0,0 @@ -# textdomain: sethome -Can use /sethome and /home=Pode usar /sethome e /home -Teleport you to your home point=Teletransportá-lo para seu ponto de origem -Teleported to home!=Teletransportado para o ponto de origem! -Set a home using /sethome=Defina um ponto de origem usando /sethome -Set your home point=Define seu ponto de origem -Home set!=Ponto de origem definido! -Player not found!=Jogador não encontrado! diff --git a/mods/sethome/locale/sethome.ru.tr b/mods/sethome/locale/sethome.ru.tr deleted file mode 100644 index 6738824..0000000 --- a/mods/sethome/locale/sethome.ru.tr +++ /dev/null @@ -1,8 +0,0 @@ -# textdomain: sethome -Can use /sethome and /home=Возможность использовать /sethome и /home -Teleport you to your home point=Вы телепортируетесь в свою домашнюю точку -Teleported to home!=Вы телепортировались домой! -Set a home using /sethome=Установите домашнюю точку, используя /sethome -Set your home point=Установите вашу домашнюю точку -Home set!=Домашняя точка установлена! -Player not found!=Игрок не обнаружен! diff --git a/mods/sethome/locale/sethome.sk.tr b/mods/sethome/locale/sethome.sk.tr deleted file mode 100644 index be5233e..0000000 --- a/mods/sethome/locale/sethome.sk.tr +++ /dev/null @@ -1,8 +0,0 @@ -# textdomain: sethome -Can use /sethome and /home=Môžeš použivať /sethome a /home -Teleport you to your home point=Teleportuj sa domov -Teleported to home!=Teleportovaný domov! -Set a home using /sethome=Nastav si domov použitím /sethome -Set your home point=Nastaviť si domov -Home set!=Domov nastavený! -Player not found!=Hráč nenájdený! diff --git a/mods/sethome/locale/sethome.sv.tr b/mods/sethome/locale/sethome.sv.tr deleted file mode 100644 index 60673ae..0000000 --- a/mods/sethome/locale/sethome.sv.tr +++ /dev/null @@ -1,8 +0,0 @@ -# textdomain: sethome -Can use /sethome and /home=Kan använda /sethome och /home -Teleport you to your home point=Teleportera dig till din hempunkt -Teleported to home!=Teleporterad hem! -Set a home using /sethome=Ställ in ett hem med /sethome -Set your home point=Ställ in din hempunkt -Home set!=Hem inställt! -Player not found!=Spelare finns inte! diff --git a/mods/sethome/locale/sethome.uk.tr b/mods/sethome/locale/sethome.uk.tr deleted file mode 100644 index d8d4a8f..0000000 --- a/mods/sethome/locale/sethome.uk.tr +++ /dev/null @@ -1,8 +0,0 @@ -# textdomain: sethome -Can use /sethome and /home=Можливість використання /sethome та /home -Teleport you to your home point=Ви телепортуєтесь у свою домашню точку -Teleported to home!=Ви телепортувались додому! -Set a home using /sethome=Встановіть домашню точку, використовуючи /sethome -Set your home point=Встановіть домашню точку -Home set!=Домашня точка встановлена! -Player not found!=Гравець не визначений! diff --git a/mods/sethome/locale/sethome.zh_CN.tr b/mods/sethome/locale/sethome.zh_CN.tr deleted file mode 100644 index 0af54ce..0000000 --- a/mods/sethome/locale/sethome.zh_CN.tr +++ /dev/null @@ -1,8 +0,0 @@ -# textdomain: sethome -Can use /sethome and /home=可以使用/sethome和/home -Teleport you to your home point=将您传送到家 -Teleported to home!=已传送到家！ -Set a home using /sethome=使用/sethome设定家 -Set your home point=设定您家的地点 -Home set!=已设定家！ -Player not found!=未找到玩家！ diff --git a/mods/sethome/locale/sethome.zh_TW.tr b/mods/sethome/locale/sethome.zh_TW.tr deleted file mode 100644 index 43e14aa..0000000 --- a/mods/sethome/locale/sethome.zh_TW.tr +++ /dev/null @@ -1,8 +0,0 @@ -# textdomain: sethome -Can use /sethome and /home=可以使用/sethome和/home -Teleport you to your home point=傳送您到您家的地點 -Teleported to home!=已傳送到家！ -Set a home using /sethome=使用/sethome設定家 -Set your home point=設定您家的地點 -Home set!=已設定家！ -Player not found!=未找到玩家！ diff --git a/mods/sethome/locale/template.txt b/mods/sethome/locale/template.txt deleted file mode 100644 index d04bd50..0000000 --- a/mods/sethome/locale/template.txt +++ /dev/null @@ -1,8 +0,0 @@ -# textdomain: sethome -Can use /sethome and /home= -Teleport you to your home point= -Teleported to home!= -Set a home using /sethome= -Set your home point= -Home set!= -Player not found!= diff --git a/mods/sethome/mod.conf b/mods/sethome/mod.conf deleted file mode 100644 index 0079925..0000000 --- a/mods/sethome/mod.conf +++ /dev/null @@ -1,2 +0,0 @@ -name = sethome -description = Minetest Game mod: sethome diff --git a/mods/story/init.lua b/mods/story/init.lua index f540340..f8b1810 100644 --- a/mods/story/init.lua +++ b/mods/story/init.lua @@ -41,11 +41,11 @@ minetest.register_on_joinplayer(function(player) minetest.sound_fade(music, .1, 1) end) ---[[ + minetest.register_on_newplayer(function(ObjectRef) - minetest.place_schematic({x = 0, y = -1, z = 0}, minetest.get_modpath("story") .. "/schems/citymap-v1.mts", "0", nil, true) + minetest.place_schematic({x = 0, y = -1, z = 0}, minetest.get_modpath("story") .. "/schems/citymap-v2.mts", "0", nil, true) ObjectRef:set_pos({x = 20, y = 0, z = 20}) -end)]] +end) minetest.register_on_player_receive_fields(function(player, formname, fields) if formname ~= "story:story_formspec" then diff --git a/mods/story/schems/citymap-v1.mts b/mods/story/schems/citymap-v1.mts deleted file mode 100644 index 228ead2..0000000 Binary files a/mods/story/schems/citymap-v1.mts and /dev/null differ diff --git a/mods/story/schems/citymap-v2.mts b/mods/story/schems/citymap-v2.mts new file mode 100644 index 0000000..7fd63cd Binary files /dev/null and b/mods/story/schems/citymap-v2.mts differ