Packman Build Service PMBS

zsdx.changes Changed

zsdx.spec Changed

@@ -18,20 +18,17 @@
 
 
 Name:           zsdx
-Version:        1.11.0
+Version:        1.12.0
 Release:        0
 Summary:        Zelda Mystery of Solarus DX
-License:        GPL-3.0-only AND CC-BY-SA-3.0 AND NonFree
+License:        GPL-3.0-only AND CC-BY-SA-4.0 AND NonFree
 Group:          Amusements/Games/RPG
 URL:            http://www.solarus-games.org/games/zelda-mystery-of-solarus-dx/
-Source:         https://github.com/christopho/zsdx/archive/%{name}-%{version}.tar.gz
-# PATCH-FIX-UPSTREAM zsdx-1.11.0-dont-require-cpp-compiler.patch -- it's not written in C++
-Patch0:         zsdx-1.11.0-dont-require-cpp-compiler.patch
-# PATCH-FIX-UPSTREAM zsdx-1.11.0-reproducible-build.patch -- attempt to make the build reproducible
-Patch1:         zsdx-1.11.0-reproducible-build.patch
+Source:         %{name}-%{version}.tar.xz
 BuildRequires:  cmake
+BuildRequires:  hicolor-icon-theme
 BuildRequires:  zip
-Requires(post): solarus >= 1.5
+Requires:       solarus >= 1.6
 BuildArch:      noarch
 
 %description
@@ -43,9 +40,7 @@
 designed for this game.
 
 %prep
-%setup -q -n %{name}-%{name}-%{version}
-%patch0 -p1
-%patch1 -p1
+%setup -q
 
 # Touch files to ensure zip will produce a deterministic output
 # See https://reproducible-builds.org/docs/archives/
@@ -59,14 +54,7 @@
 make %{?_smp_mflags}
 
 %install
-cd build
-%make_install
-
-%post
-if [ -n "$DISPLAY" ]; then
-    # Add quest to solarus launcher
-    solarus -add %{_datadir}/solarus/zsdx/
-fi
+%cmake_install
 
 %files
 %doc readme.md changelog.txt
@@ -75,5 +63,12 @@
 %dir %{_datadir}/solarus/
 %dir %{_datadir}/solarus/zsdx
 %{_datadir}/solarus/zsdx/data.solarus
+%{_datadir}/applications/zsdx.desktop
+%{_datadir}/icons/hicolor/*/apps/zsdx.png
+%{_datadir}/pixmaps/zsdx.png
+# Own these directories because hicolor-icon-theme doesn't provide such
+# a resolution: 1024x1024
+%dir %{_datadir}/icons/hicolor/1024x1024
+%dir %{_datadir}/icons/hicolor/1024x1024/apps
 
 %changelog

zsdx-1.11.0-dont-require-cpp-compiler.patch Deleted

zsdx-1.11.0-reproducible-build.patch Deleted

_service Added

_servicedata Added

zsdx-1.11.0.tar.gz/.gitignore Deleted

zsdx-1.11.0.tar.gz/data/languages/es/images/translation.txt Deleted

@@ -1,55 +0,0 @@
-Zelda Mystery of Solarus DX Spanish translation (Images)
-
-The engine displays some images that contain text. They all are in the directory languages/XX/images. I will do the pixel work for you, so you just have to make the textual translations.
-
-Here is the exhaustive list of language-specific images and their content.
-
-Each string to translate is listed below with the following syntax: English version: Spanish translation (comments)
-Please fill in the missing translations. Comments are here only to explain you where each image appears.
-
-languages/XX/images/action_icon.png: image containing all the possible variants of the action icon (the blue icon in the game):
-Confirm: Confirmar (validate a choice while saving the game)
-Next: Siguiente (show the next message during a dialog)
-Info: Información (in the inventory menu, show information about an item)
-Back: Volver (get back to the game after a dialog)
-Check: Revisar (look at an interactive element in the game (like a sign or a door))
-Open: Abrir (open a door or a chest)
-Action: Acción (activate an object)
-Pick up: Levantar (lift an item like a pot, a bush, a stone, etc.)
-Throw: Arrojar (throw a lifted item)
-Grab: Agarrar (grab a block)
-Stop: Parar (stop an ongoing action (like using a magic-consuming item)
-Speak: Hablar (talk to an NPC)
-Change: Cambiar (change the value of an option in a menu)
-Swim: Nadar (swim faster in water)
-languages/XX/images/sword_icon.png: image containing all the possible variants of the sword icon (the green icon in the game):
-Save: Guardar (save the game)
-Back: Volver (get back to the game after a dialog)
-Confirm: Confirmar (validate a choice while saving the game)
-Skip: Omitir (skip the current dialog)
-languages/XX/images/pause_icon.png: image containing all the possible variants of the pause icon (the orange icon in the game):
-Pause: Pausa (pause the game)
-Back: Volver (unpause the game)
-languages/XX/images/floors.png: image containing all possible floor numbers that can be displayed in dungeons:
-B16: B16 (sixteenth basement floor)
-B15: B15 (fifteenth basement floor)
-...
-B1: B1 (first basement floor)
-1F: 1F (first floor)
-2F: 2F (second floor)
-...
-16F: 16F (sixteenth floor)
-languages/XX/images/gameover_menu.png: image displayed when the game is over:
-Game Over: Fin de la partida
-Save and continue: Guardar y continuar
-Save and exit: Guardar y salir
-Continue without saving: Continuar sin guardar
-Exit without saving: Salir sin guardar
-languages/XX/images/pause_submenus.png: image containing the background of each pause submenu and its title:
-Inventory: Inventario (title of the inventory submenu, that displays the items found by the player)
-Map: Mapa (title of the map submenu, that displays the world minimap or the current dungeon minimap)
-Quest status: Estado de la Aventura (title of the quest status submenu, that displays the equipment, the pieces of heart and the finished dungeons)
-Options: Opciones (title of the options submenu, that lets the player configure the video mode and the keyboard and joypad commands)
-languages/XX/images/title_screen_initialization.png: image displayed when the program starts, before the title screen
-Solarus Games presents: Solarus Games Presenta
-

zsdx-1.11.0.tar.gz/data/languages/kikoolol Deleted

zsdx-1.11.0.tar.gz/data/languages/kikoolol/images Deleted

zsdx-1.11.0.tar.gz/data/languages/kikoolol/images/action_icon.png Deleted

zsdx-1.11.0.tar.gz/data/languages/kikoolol/images/floors.png Deleted

zsdx-1.11.0.tar.gz/data/languages/kikoolol/images/gameover_menu.png Deleted

zsdx-1.11.0.tar.gz/data/languages/kikoolol/images/pause_icon.png Deleted

zsdx-1.11.0.tar.gz/data/languages/kikoolol/images/pause_submenus.png Deleted

zsdx-1.11.0.tar.gz/data/languages/kikoolol/images/sword_icon.png Deleted

zsdx-1.11.0.tar.gz/data/languages/kikoolol/images/title_screen_initialization.png Deleted

zsdx-1.11.0.tar.gz/data/languages/kikoolol/text Deleted

zsdx-1.11.0.tar.gz/data/languages/kikoolol/text/dialogs.dat Deleted

@@ -1,6507 +0,0 @@
--- This is a Lua dialog file for solarus 0.9.1 or greater.
--- This dialog file was converted from the 0.9.0 ini syntax using the script
--- tools/data_files_conversion/0.9.0_to_0.9.1/convert_dialogs.lua.
-
--- Plume / Feather
-dialog{
-  id = "_item_description.feather.1",
-  icon = 0,
-  skip = "all",
-  text = [[
-Utilise la Plume
-pour sauter et fran-
-chir des obstacles.
-]]
-}
---------------------
-
--- Bombes / Bombs
-dialog{
-  id = "_item_description.bombs_counter.1",
-  icon = 1,
-  skip = "all",
-  text = [[
-Utilise les Bombes
-contre les ennemis
-ou pour faire
-exploser des
-obstacles.
-]]
-}
---------------------
-
--- Arc / Bow
-dialog{
-  id = "_item_description.bow.1",
-  icon = 2,
-  skip = "all",
-  text = [[
-Tu n'as plus de
-Flèches !
-]]
-}
---------------------
-
--- Arc & Flèches / Bow & Arrows
-dialog{
-  id = "_item_description.bow.2",
-  icon = 3,
-  skip = "all",
-  text = [[
-Tire des Flèches
-pour vaincre des
-ennemis coriaces.
-]]
-}
---------------------
-
--- Boomerang
-dialog{
-  id = "_item_description.boomerang.1",
-  icon = 4,
-  skip = "all",
-  text = [[
-Utilise le Boomerang
-pour immobiliser les
-ennemis ou attraper
-des objets à
-distance.
-]]
-}
---------------------
-
--- Super Boomerang
-dialog{
-  id = "_item_description.boomerang.2",
-  icon = 35,
-  skip = "all",
-  text = [[
-Utilise le Super
-Boomerang pour
-immobiliser les
-ennemis ou attraper
-des objets à
-distance.
-]]
-}
---------------------
-
--- Lanterne / Lamp
-dialog{
-  id = "_item_description.lamp.1",
-  icon = 5,
-  skip = "all",
-  text = [[
-Eclaire-toi dans le
-noir ou allume des
-braseros à l'aide
-de la Lanterne. Mais
-surveille ton
-compteur magique !
-]]
-}
---------------------
-
--- Grappin / Hook Shot
-dialog{
-  id = "_item_description.hookshot.1",
-  icon = 6,
-  skip = "all",
-  text = [[
-Hisse-toi à des
-endroits
-inaccessibles grâce
-au Grappin.
-]]
-}
---------------------
-
--- Flacon Magique vide / Empty bottle
-dialog{
-  id = "_item_description.bottle_1.1",
-  icon = 7,
-  skip = "all",
-  text = [[
-Le Flacon Magique
-peut contenir di-
-verses substances...
-]]
-}
---------------------
-
--- Eau dans Flacon / Water in Bottle
-dialog{
-  id = "_item_description.bottle_1.2",
-  icon = 8,
-  skip = "all",
-  text = [[
-Ton Flacon Magique
-contient de l'eau.
-
-Verse-la à un
-endroit approprié...
-]]
-}
---------------------
-
--- Potion rouge / Red potion
-dialog{
-  id = "_item_description.bottle_1.3",
-  icon = 9,
-  skip = "all",
-  text = [[
-Bois de la Potion
-rouge pour retrouver
-tous tes Coeurs.
-]]
-}
---------------------
-
--- Potion verte / Red potion
-dialog{
-  id = "_item_description.bottle_1.4",
-  icon = 10,
-  skip = "all",
-  text = [[
-Bois de la Potion
-verte pour retrouver
-toute ta magie.
-]]
-}
---------------------
-
--- Potion bleue / Red potion
-dialog{
-  id = "_item_description.bottle_1.5",
-  icon = 11,
-  skip = "all",
-  text = [[
-Bois de la Potion
-bleue pour retrouver
-vie et magie !
-]]
-}
---------------------
-
--- Fée dans Flacon / Fairy in Bottle
-dialog{
-  id = "_item_description.bottle_1.6",
-  icon = 12,
-  skip = "all",
-  text = [[
-Cette Fée te viendra
-en aide si tu es en
-difficulté.
-Tu peux aussi
-l'utiliser à tout
-moment pour
-récupérer des
-Coeurs !

zsdx-1.11.0.tar.gz/data/languages/kikoolol/text/strings.dat Deleted

@@ -1,170 +0,0 @@
-# Language: kikoolol
-
-# This file contains the strings displayed during the game in the current language.
-# Each line represents a string, representing by its key and then its value.
-# The key and the value are separated by one or several tabulation characters.
-# The key cannot contain whitespaces and cannot be changed. Only the value has to be translated.
-# This file must be encoded in UTF-8.
-
-# The strings having a key with "caption" are displayed
-# in the caption text area of the pause menu. They can have one or two lines
-# (separated by the '$' character) and a line should never exceed 20 characters.
-# For all other strings, the maximum length is indicated in the comments below.
-
-# Map submenu
-map.caption.world_map			Karte du Monde
-map.caption.dungeon_name_1		Dongeon de la Foré
-map.caption.dungeon_name_2		Kaverne de Rock
-map.caption.dungeon_name_3		Antr de$Métre Arblol
-map.caption.dungeon_name_4		Palé de Lolmont
-map.caption.dungeon_name_5		Ancien$Chapito
-map.caption.dungeon_name_6		Dédal d'Inferlol
-map.caption.dungeon_name_7		Templ dé Kristo
-map.caption.dungeon_name_8		Dongeon des$Piques Rocheu
-map.caption.dungeon_name_9		Tampl dé Souvenirs ll
-map.caption.dungeon_name_10		Tourre dé sieu
-
-# Quest status submenu
-quest_status.caption.rupee_bag_1	Sac de Ruby
-quest_status.caption.rupee_bag_2	Gran$Sac de Ruby
-quest_status.caption.rupee_bag_3	Sac 2 Rubis$Supayr gran
-quest_status.caption.bomb_bag_1		Sac 2 Bombe mdr
-quest_status.caption.bomb_bag_2		Plu Gran$Sack de Bombe
-quest_status.caption.bomb_bag_3		Sac de Bombes$Tro Géan
-quest_status.caption.quiver_1		Karkoi
-quest_status.caption.quiver_2		Grand Karkoi
-quest_status.caption.quiver_3		Karkoi de ouf
-quest_status.caption.world_map		Kart du Mond
-quest_status.caption.pieces_of_heart	Fragmen de <3
-quest_status.caption.tunic_1		Cotte de Mailles$vairte
-quest_status.caption.tunic_2		Kotte de Maille$bleu
-quest_status.caption.tunic_3		Cotte de Maille$Ki maille
-quest_status.caption.sword_1		Aipai du Courage
-quest_status.caption.sword_2		Gléve Lolien
-quest_status.caption.sword_3		Sabr du Hairos
-quest_status.caption.sword_4		Lame Purificamdr
-quest_status.caption.shield_1		Bouclié
-quest_status.caption.shield_2		Bouclié de Feu!!!!!
-quest_status.caption.shield_3		Bouclié Miroire
-
-# Inventory submenu
-inventory.caption.item.feather.1			Plumes
-inventory.caption.item.bombs_counter.1			Bombe
-inventory.caption.item.bow.1				Ark
-inventory.caption.item.bow.2				Ark & Flaiche
-inventory.caption.item.boomerang.1			Boumeurangue
-inventory.caption.item.boomerang.2			Super Boumeurangue
-inventory.caption.item.lamp.1				Lantern
-inventory.caption.item.hookshot.1			Grapin
-inventory.caption.item.bottle_1.1			Flakon Magique$(ri1)
-inventory.caption.item.bottle_1.2			Flakon Magique$(o)
-inventory.caption.item.bottle_1.3			Flakon Magique$(Possion rouge)
-inventory.caption.item.bottle_1.4			Flakon Magique$(Possion verte)
-inventory.caption.item.bottle_1.5			Flakon Magique$(Possion bleue)
-inventory.caption.item.bottle_1.6			Flakon Magique$(Fai)
-
-inventory.caption.item.pegasus_shoes.1			Bottes de Pet-gas
-inventory.caption.item.mystic_mirror.1			Miroir Mistik!!
-inventory.caption.item.cane_of_somaria.1		Kanne de Lolmaria
-inventory.caption.item.apples_counter.1			Pome
-inventory.caption.item.pains_au_chocolat_counter.1	P1 au Schokobon
-inventory.caption.item.croissants_counter.1		Kroassan
-inventory.caption.item.bottle_2.1			Flakon Magique$(Ri1)
-inventory.caption.item.bottle_2.2			Flakon Magique$(O)
-inventory.caption.item.bottle_2.3			Flakon Magique$(Possion rouge)
-inventory.caption.item.bottle_2.4			Flakon Magique$(Possion verte)
-inventory.caption.item.bottle_2.5			Flakon Magique$(Possion bleue)
-inventory.caption.item.bottle_2.6			Flakon Magique$(Fai)
-
-inventory.caption.item.rock_key.1			Clai de Rocl
-inventory.caption.item.bone_key.1			Clai d'Osse
-inventory.caption.item.clay_key.1			Clai Pomme de Terre
-inventory.caption.item.level_4_way.1			Tart o Pomme
-inventory.caption.item.level_4_way.2			Lingo d'or!!!!
-inventory.caption.item.level_4_way.3			Fleur bizar
-inventory.caption.item.level_4_way.4			Praissis d'escrim
-inventory.caption.item.flippers.1			Truk pour nagé
-inventory.caption.item.magic_cape.1			Truk pour volé
-inventory.caption.item.bottle_3.1			Flakon Magique$(Vide)
-inventory.caption.item.bottle_3.2			Flakon Magique$(Eau)
-inventory.caption.item.bottle_3.3			Flakon Magique$(Potion rouge)
-inventory.caption.item.bottle_3.4			Flakon Magique$(Potion verte)
-inventory.caption.item.bottle_3.5			Flakon Magique$(Potion bleue)
-inventory.caption.item.bottle_3.6			Flakon Magique$(Fée)
-
-inventory.caption.item.iron_key.1			Clai de Faire
-inventory.caption.item.stone_key.1			Clai de Pier
-inventory.caption.item.wooden_key.1			Clai de Boa
-inventory.caption.item.ice_key.1			Clai de Glasse
-inventory.caption.item.glove.1				Poagne de Ferre
-inventory.caption.item.glove.2				Poagne d'Orre
-inventory.caption.item.fire_stones_counter.1		Pier de Feu
-inventory.caption.item.bottle_4.1			Flakon Magie$(Vide)
-inventory.caption.item.bottle_4.2			Flakon Magie$(Eau)
-inventory.caption.item.bottle_4.3			Flakon Magie$(Potion rouge)
-inventory.caption.item.bottle_4.4			Flakon Magie$(Potion verte)
-inventory.caption.item.bottle_4.5			Flakon Magie$(Potion bleue)
-inventory.caption.item.bottle_4.6			Flakon Magie$(Fée)
-
-# Options submenu
-options.caption.press_action_change_mode	Apui sur Action$pour changé 2 mod
-options.caption.press_action_customize_key	Appuié sur Action pour$configuré cet touch
-options.caption.press_key			Appui sur 1 touch$du clavié ou du joypad lol
-# names of video modes (maximum 26 characters)
-options.video_mode_0				Fenêtre petite
-options.video_mode_1				Fenêtre petite et lisse
-options.video_mode_2				Fenêtre tro petite lol
-options.video_mode_3				Plein écran étirai
-options.video_mode_4				Plein écran étirai (kom ta mere lol)
-options.video_mode_5				Plein écran liss
-options.video_mode_6				Plein écran liss (kom ta mere lol)
-options.video_mode_7				Pl1 écran centrai
-options.video_mode_8				Pl1 écran centrai (kom ta mere lol)
-# column headers of the keyboard/joypad customization table (maximum 10 characters)
-options.commands_column				Kommande
-options.keyboard_column				Christian Klavier
-options.joypad_column				Jouipad
-
-# Game controls customization (maximum 10 characters)
-controls.game_key_1		Akssion
-controls.game_key_2		Aipai
-controls.game_key_3		Obj goche
-controls.game_key_4		Obj droa
-controls.game_key_5		Pose
-controls.game_key_6		Droate
-controls.game_key_7		Ho
-controls.game_key_8		Goche
-controls.game_key_9		Ba
-
-# Dialog to save the game
-save_dialog.yes			wi lol
-save_dialog.no			non mdr
-save_dialog.save_question_0	Tu ve sauvé ton jeu????
-save_dialog.save_question_1	stp di oui !!
-save_dialog.continue_question_0	Tu veu continué ton jeu
-save_dialog.continue_question_1	stp ?
-
-# Savegame selection menu (with maximum 45 characters for phase titles)
-selection_menu.phase.select_file	Choisi 1 fichié
-selection_menu.phase.choose_mode	Choisi 1 mod de jeu
-selection_menu.phase.choose_name	ASL? Cé koi ton non
-selection_menu.phase.confirm_erase	Tu jur ?
-selection_menu.phase.erase_file		Quel fichié tu ve zigouiller lol ?
-selection_menu.phase.options		Appui sur Espace stuveu
-selection_menu.phase.options.changing	<  > : choisir, Espace : validé
-selection_menu.erase			Effasser
-selection_menu.cancel			Annulé
-selection_menu.big_yes			OUI OUI
-selection_menu.big_no			NON JÉDI
-selection_menu.empty			Vid
-selection_menu.options			Optssons
-selection_menu.back			Retourre
-selection_menu.options.language		Langue lol
-selection_menu.options.video_mode	Mod
-selection_menu.options.music_volume	Volume de la zik
-selection_menu.options.sound_volume	Volume des ssons
-
-# Title screen
-title_screen.website		www.zelda-lolarus.com
-title_screen.press_space	Appuyi sur espasse
-

zsdx-1.11.0.tar.gz/data/languages/nl Deleted

zsdx-1.11.0.tar.gz/data/languages/nl/images Deleted

zsdx-1.11.0.tar.gz/data/languages/nl/images/action_icon.png Deleted

zsdx-1.11.0.tar.gz/data/languages/nl/images/floors.png Deleted

zsdx-1.11.0.tar.gz/data/languages/nl/images/gameover_menu.png Deleted

zsdx-1.11.0.tar.gz/data/languages/nl/images/pause_icon.png Deleted

zsdx-1.11.0.tar.gz/data/languages/nl/images/pause_submenus.png Deleted

zsdx-1.11.0.tar.gz/data/languages/nl/images/sword_icon.png Deleted

zsdx-1.11.0.tar.gz/data/languages/nl/images/title_screen_initialization.png Deleted

zsdx-1.11.0.tar.gz/data/languages/nl/text Deleted

zsdx-1.11.0.tar.gz/data/languages/nl/text/engine_dialogs.dat Deleted

@@ -1,1830 +0,0 @@
-# Ce fichier comporte l'ensemble des messages affichés
-# par le moteur de jeu en version française.
-# Les messages affichés par les maps sont quant à eux
-# définis dans le fichier text/game_dialogs.zsd.
-
-####################################################################################
-#             Syntaxe des fichiers text/engine_dialogs.zsd et text/game_dialogs.zsd
-#
-# La syntaxe est similaire à celle d'un fichier ini de Windows.
-# Les lignes commençant par le caractère '#' sont des commentaires
-# et sont ignorés par le jeu.
-# Un message est défini par les éléments suivants :
-#
-# - Un identificateur entre crochets.
-# Les messages du moteur de jeu (donc tous ceux dans ce fichier)
-# ont toujours un identificateur qui commence par le caractère '_'.
-# L'identificateur permet au jeu de faire référence au message qu'il
-# souhaite l'afficher. Les identificateurs ne doivent pas être traduits.
-#
-# - Les valeurs line1, line2 et line3 : définissent le contenu du
-# message, sur une à trois lignes. Le texte de chaque ligne
-# doit être mis entre guillemets. Une ligne ne doit pas
-# dépasser 23 caractères. Lors de la traduction, ce sont ces lignes
-# qu'il faut traduire.
-#
-# - La valeur next : donne l'identificateur du prochain message
-# à afficher. Si cette valeur n'est pas définie, cela signifie
-# que ce message était le dernier de la série et la boîte de 
-# dialogue va se fermer une fois qu'il sera terminé.
-# Si la valeur next existe, alors une flèche s'affiche en bas du message courant,
-# indiquant que ce message va être suivi d'un autre.
-# Si la valeur next n'existe pas, alors la flèche est remplacée par un carré
-# indiquant que c'était le dernier message de la série.
-# Un message contenant une question est toujours affiché avec une flèche.
-# Il peut arriver que bien qu'une série se termine, on souhaite afficher une flèche.
-# C'est le cas en particulier lorsqu'on sait qu'elle sera immédiatement suivie
-# par une nouvelle série mais qu'on ne sait pas encore laquelle (cela peut dépendre
-# de la quête). Dans ce cas, on utilise la valeur spéciale "_unknown"
-# afin d'indiquer que la série va être suivie d'une autre série, pour l'instant indéterminée.
-# Cela a pour seul effet d'afficher la flèche au lieu du carré,
-# mais ensuite tout se passe comme si aucune valeur next n'était définie. 
-#
-# - Par convention, lorsqu'un texte est trop long pour tenir
-# dans un seul message, la suite est dans un ou plusieurs messages
-# dont l'identificateur est le même auquel on ajoute ".2", puis
-# ".3", etc. Lors de la traduction, on peut ainsi faire tenir
-# le texte dans un nombre différent de messages sans avoir
-# de problèmes d'identificateurs. Seul le premier message
-# de la série doit avoir exactement le même identificateur que
-# dans la version française. Si le dernier message de la série
-# se termine par ".4" au
-# lieu de ".3" parce que la traduction ne tenait pas dans le même
-# nombre de messages, cela fonctionne sans problème.
-# C'est sur tous les messages autres que ceux finissant par
-# ".2", ".3", etc, qu'il faut bien se synchroniser.
-#
-# - La valeur cancel : définit ce qui se passe lorsque le joueur
-# tente d'interrompre le message en appuyant sur la touche C. Il y a
-# 3 valeurs possibles :
-#    - none (par défaut) : le message ne peut pas être passé.
-#    - current : si on appuie sur C, le message courant s'affiche
-#                immédiatement en entier (au lieu de défiler lettre par lettre).
-#                On peut ainsi passer plus vite au message suivant.
-#    - all : si on appuie sur C, le message courant s'arrête
-#            et les messages suivants ne seront pas affichés. La
-#            boîte de dialogue se ferme immédiatement.
-# La valeur de cancel s'applique au message courant et à tous les
-# messages suivants, jusqu'à ce que la valeur soit changée ou que
-# la boîte de dialogue se ferme.
-#
-# - La valeur icon : permet d'afficher une icône de 16*16 pixels dans le message.
-# La valeur est un numéro qui permet d'identifier l'icône dans
-# le fichier image des icônes. L'icône s'affiche à gauche du texte
-# et le texte ne doit pas dépasser 20 caractères (au lieu de 23 en
-# temps normal). Elle reste affichée dans les messages suivants,
-# jusqu'à ce que sa valeur soit changée ou que la boîte de dialogue
-# se ferme. Une valeur -1 signifie d'enlever l'icône.
-# Les icônes sont surtout utilisées dans les messages du moteur de
-# jeu, par exemple lorsque le joueur obtient un trésor.
-#
-# - La valeur question : permet d'afficher une question avec deux
-# réponses au choix. La première ligne est la question
-# et les deux dernières lignes sont les deux réponses possibles.
-# Ces deux lignes sont alors limitées à 20
-# caractères (au lieu de 23 en temps normal) car un curseur en
-# forme de flèche permet au joueur de choisir sa réponse. Il est
-# possible d'avoir à la fois une icône et une question, dans ce cas
-# le nombre de caractères des lignes de réponse se limite à 17.
-# S'il y a une question, il est possible de spécifier une valeur
-# next2. Si la première réponse est choisie, le prochain message
-# affiché est indiqué par next. Si la deuxième réponse est choisie,
-# il est alors indiqué par next2. Comme pour la valeur next,
-# si next2 n'est pas spécifié et que le joueur choisit la réponse 2,
-# la série de messages s'arrête et la boîte de dialogue se ferme.
-#
-# - Enfin, il existe des séquences particulières que l'on peut
-# insérer dans le texte d'un message :
-#    - $0 : fait une pause d'une seconde dans le défilement du message.
-#    - $1 : met une vitesse de défilement lente
-#    - $2 : met une vitesse de défilement moyenne
-#    - $3 : met une vitesse de déliement rapide (par défaut)
-#    - $v : permet d'insérer la valeur d'une variable dans le texte
-#           du message (la valeur est alors spécifiée dans
-#           le programme qui a demandé l'affichage du message)
-#
-#
-# - Les commentaires suivants permettent de vérifier le nombre
-# limite de caractères dans un message :
-#
-#       |-----------------------| sans icône ni question (23)
-#       |--------------------|    avec icône ou question (20)
-#       |-----------------|       avec icône et question (17)
-####################################################################################
-
-
-# -------------------------------------
-# Description des items de l'inventaire
-# -------------------------------------
-# 
-# Les messages ci-dessous sont affichés dans l'écran d'inventaire
-# lorsque le joueur souhaite afficher la description d'un item
-# qu'il possède. Ces messages peuvent être annulés en appuyant
-# sur C.
-# L'identificateur de chacun de ces messages est de la forme _item_description_i_x
-# où i est le numéro de l'item (de 0 à 27) et x est la variante de cet
-# item possédée par le joueur.
-# Exception : les items 13, 20 et 27 ne sont pas définis car il s'agit des Flacons 2, 3 et 4,
-# et ces derniers se contentent de faire appel aux messages définis pour le Flacon 1 (item n°6).
-
-[_item_description_0_1]
-# Plume / Feather
-#       |--------------------|
-icon = 0
-line1 = "Gebruik de Veer om"
-line2 = "te springen en"
-line3 = "obstakels te"
-next = _item_description_0_1.1
-
-[_item_description_0_1.1]
-#       |--------------------|
-line1 = "overschrijden."
-
-[_item_description_1_1]
-# Bombes / Bombs
-#       |--------------------|
-icon = 1
-line1 = "Gebruik Bommen tegen"
-line2 = "vijanden of om"
-line3 = "obstakels te laten"
-cancel = all
-next = _item_description_1_1.1
-
-[_item_description_1_1.1]
-#       |--------------------|
-line1 = "ontploffen."
-
-[_item_description_2_1]
-# Arc / Bow
-#       |--------------------|
-icon = 2
-line1 = "Je hebt geen Pijlen"
-line2 = "meer!"
-cancel = all
-
-[_item_description_2_2]
-# Arc & Flèches / Bow & Arrows
-#       |--------------------|
-icon = 3
-line1 = "Schiet Pijlen om"
-line2 = "taaie vijanden te"
-line3 = "overwinnen."
-cancel = all
-
-[_item_description_3_1]
-# Boomerang
-#       |--------------------|
-icon = 4
-line1 = "Gebruik de Boemerang"
-line2 = "om vijanden"
-line3 = "onbeweeglijk te"
-cancel = all
-next = _item_description_3_1.1
-
-[_item_description_3_1.1]
-#       |--------------------|
-line1 = "maken of op afstand"
-line2 = "voorwerpen te" 
-line3 = "vangen."
-
-[_item_description_4_1]
-# Lanterne / Lamp
-#       |--------------------|
-icon = 5
-line1 = "Bijlicht je in de"
-line2 = "duisternis of steek"
-line3 = "vuurpotten aan met"
-cancel = all
-next = _item_description_4_1.1
-

zsdx-1.11.0.tar.gz/data/languages/nl/text/game_dialogs.dat Deleted

@@ -1,1959 +0,0 @@
-# Ce fichier contient l'ensemble des dialogues de l'aventure.N
-# Les dialogues du moteur de jeu sont dans le fichier text/engine_dialogs.zsd,
-# ainsi que la spécification de la syntaxe de ces deux fichiers.
-
-[demo_finished]
-# Lorsqu'on vient de finir le donjon 1
-#       |-----------------------|
-line1 = "Proficiat: u hebt die"
-line2 = "demo beïndigd! We hopen"
-line3 = "Dat u die geapprëcieed"
-next = demo_finished.2
-
-[demo_finished.2]
-#       |-----------------------|
-line1 = "hebt. Om op de"
-line2 = "volledig spel te"
-line3 = "wachten, kunt u"
-next = demo_finished.3
-
-[demo_finished.3]
-#       |-----------------------|
-line1 = "www.zelda-solarus.com"
-line2 = "bezoeken om de laatste"
-line3 = "informaties over de"
-next = demo_finished.4
-
-[demo_finished.4]
-#       |-----------------------|
-line1 = "ontwikkeling te"
-line2 = "krijgen. Dank u voor"
-line3 = "het spelen!"
-
-
-[demo_finished]
-# Lorsqu'on vient de finir le donjon 1
-#       |-----------------------|
-line1 = ""
-line2 = ""
-line3 = ""
-next = demo_finished.2
-
-
-[outside_world.not_in_demo]
-# Lorsqu'on tente d'entrer dans une grotte pas encore faite dans la démo
-#       |-----------------------|
-line1 = "Deze plaats is nog niet"
-line2 = "beschikbaar!"
-cancel = current
-
-[outside_world.dungeon_2_entrance.monkey]
-# Dialogue avec le singe après avoir fini le donjon 1
-#       |-----------------------|
-line1 = "Sorry, het vervolg is"
-line2 = "nog niet beschikbaar!"
-
-[chest.not_in_demo]
-# Lorsqu'on tente d'ouvrir le coffre qui contiendra l'arc, non disponible dans la démo
-#       |-----------------------|
-line1 = "Sorry, deze schat is"
-line2 = "nog niet beschikbaar!"
-cancel = current
-
-[dungeon_1]
-# Lorsqu'on pénètre dans le donjon 1
-#       |-----------------------|
-line1 = "     Eerste level      "
-line2 = "      Vorstkerker      "
-
-[intro0]
-# Intro : écran noir
-#       |-----------------------|
-line1 = "$2Oude legenden"
-line2 = "vertellen dat, lang"
-line3 = "geleden, bestond een"
-next = intro0.2
-
-[intro0.2]
-#       |-----------------------|
-line1 = "geweldig koninkrijk"
-line2 = "genaamd Hyrule."
-next = intro0.3
-
-[intro0.3]
-#       |-----------------------|
-line1 = "Dit koninkrijk bloeide"
-line2 = "onder de zegen van de"
-line3 = "drie godinnen wie het"
-next = intro0.4
-
-[intro0.4]
-#       |-----------------------|
-line1 = "in voorouderlijke"
-line2 = "tijden hadden"
-line3 = "geschapen."
-next = intro0.5
-
-[intro0.5]
-#       |-----------------------|
-line1 = "De drie godinnen"
-line2 = "waren afgebeeld in de"
-line3 = "vorm van de Triforce,"
-next = intro0.6
-
-[intro0.6]
-#       |-----------------------|
-line1 = "symbool van eindloze"
-line2 = "macht die de"
-line3 = "begerigheid aantrekte."
-next = intro0.7
-
-[intro0.7]
-#       |-----------------------|
-line1 = "Zeven Wijzen waren"
-line2 = "gekozen om de Triforce"
-line3 = "in het Gouden Land, de"
-next = intro0.8
-
-[intro0.8]
-#       |-----------------------|
-line1 = "utopische"
-line2 = "weerspiegeling van de"
-line3 = "wereld, te verbergen."
-next = intro0.9
-
-[intro0.9]
-#       |-----------------------|
-line1 = "Daarna gingen de eeuwen"
-line2 = "voorbij..."
-
-[intro1]
-# Intro : fresque 1
-#       |-----------------------|
-line1 = "$2Veel generaties later"
-line2 = "scheen een hekserij"
-line3 = "Hyrule te dreigen."
-next = intro1.2
-
-[intro1.2]
-#       |-----------------------|
-line1 = "Terwijl de duisternis"
-line2 = "het koninkrijk begon"
-line3 = "te overstromen,"
-next = intro1.3
-
-[intro1.3]
-#       |-----------------------|
-line1 = "verscheen en"
-line2 = "geheimzinnige tovenaar"
-line3 = "genaamd Agahnim, die"
-next = intro1.4
-
-[intro1.4]
-#       |-----------------------|
-line1 = "de problemen door zijn"
-line2 = "tovermiddelen oploste."
-line3 = "Door de volk"
-next = intro1.5
-
-[intro1.5]
-#       |-----------------------|
-line1 = "toegejuicht, benoemde"
-line2 = "de Koning hem op een"
-line3 = "hooggeplaatste post."
-next = intro1.6
-
-[intro1.6]
-#       |-----------------------|
-line1 = "Maar in werkelijkheid"
-line2 = "komplotteerde hij tegen"
-line3 = "de koninklijke familie."
-next = intro1.7
-
-[intro1.7]
-#       |-----------------------|
-line1 = "Hij was aan het"
-line2 = "proberen Ganondorf,"
-line3 = "koning van bandieten"
-next = intro1.8
-
-[intro1.8]
-#       |-----------------------|
-line1 = "van een vergeten tijd,"
-line2 = "terug te laten komen."
-
-[intro2]
-# Intro : fresque 2
-#       |-----------------------|
-line1 = "$2Men vertelt dat een"
-line2 = "jonge man van groen"
-line3 = "gekleed zich in een"
-next = intro2.2
-
-[intro2.2]
-#       |-----------------------|
-line1 = "avontuur stortte door"
-line2 = "het koninkrijk,"
-line3 = "verkennend verlorene"
-next = intro2.3
-

zsdx-1.11.0.tar.gz/data/languages/nl/text/strings.dat Deleted

@@ -1,143 +0,0 @@
-# Language: Dutch
-
-# This file contains the strings displayed during the game in the current language.
-# Each line represents a string, representing by its key and then its value.
-# The key and the value are separated by one or several tabulation characters.
-# The key cannot contain whitespaces and cannot be changed. Only the value has to be translated.
-# This file must be encoded in UTF-8.
-
-# The strings having a key with "caption" are displayed
-# in the caption text area of the pause menu. They can have one or two lines
-# (separated by the '$' character) and a line should never exceed 20 characters.
-# For all other strings, the maximum length is indicated in the comments below.
-
-# Map submenu
-map.caption.world_map			Wereld Kaart
-map.caption.dungeon_name_1		Vorstkerker
-map.caption.dungeon_name_2		Rotsgrot
-map.caption.dungeon_name_3		Meester Arbrors$Hol
-map.caption.dungeon_name_4		Beaumont Paleis
-map.caption.dungeon_name_5		Oud$Kasteel van Hyrule
-map.caption.dungeon_name_6		Infernos Grot
-map.caption.dungeon_name_7		Ijstempel
-map.caption.dungeon_name_8		Kerker van de$Rotsachtige Pieken
-map.caption.dungeon_name_9		Herinneringenstempel
-
-# Quest status submenu
-quest_status.caption.rupee_bag_1	Robjinenzak
-quest_status.caption.rupee_bag_2	Grote$Robjinenzak
-quest_status.caption.rupee_bag_3	Reusachtige$Robjinenzak
-quest_status.caption.bomb_bag_1		Bommenzak
-quest_status.caption.bomb_bag_2		Grote Bommenzak
-quest_status.caption.bomb_bag_3		Reusachtige$Bommenzak
-quest_status.caption.quiver_1		Koker
-quest_status.caption.quiver_2		Grote Koker
-quest_status.caption.quiver_3		Reusachtige Koker
-quest_status.caption.world_map		Wereld Kaart
-quest_status.caption.pieces_of_heart	Stukjes Hart
-quest_status.caption.tunic_0		Groene$Maliënkolder
-quest_status.caption.tunic_1		Blauwe$Maliënkolder
-quest_status.caption.tunic_2		Rode$Maliënkolder
-quest_status.caption.sword_1		Zwaard van de Moed
-quest_status.caption.sword_2		Hyliaan Gladius
-quest_status.caption.sword_3		Helds Sabel
-quest_status.caption.sword_4		Zuiverend Blad
-quest_status.caption.shield_1		Schild
-quest_status.caption.shield_2		Vuurschild
-quest_status.caption.shield_3		Spiegelschild
-
-# Inventory submenu
-inventory.caption.item_0_1	Veer
-inventory.caption.item_1_1	Bommen
-inventory.caption.item_2_1	Boog
-inventory.caption.item_2_2	Boog & Pijlen
-inventory.caption.item_3_1	Boemerang
-inventory.caption.item_4_1	Lantaarn
-inventory.caption.item_5_1	Enterhaak
-inventory.caption.item_6_1	Magische Flacon$(Leeg)
-inventory.caption.item_6_2	Magische Flacon$(Water)
-inventory.caption.item_6_3	Magische Flacon$(Rood Drankje)
-inventory.caption.item_6_4	Magische Flacon$(Groen Drankje)
-inventory.caption.item_6_5	Magische Flacon$(Blauw Drankje)
-inventory.caption.item_6_6	Magische Flacon$(Elf)
-
-inventory.caption.item_7_1	Pegasus Laarzen
-inventory.caption.item_8_1	Mystiek Spiegel
-inventory.caption.item_9_1	Somarias Cane
-inventory.caption.item_10_1	Appels
-inventory.caption.item_11_1	Chocolade Broodjes
-inventory.caption.item_12_1	Croissants
-
-inventory.caption.item_14_1	Rotssleutel
-inventory.caption.item_15_1	Rode Sleutel
-inventory.caption.item_16_1	Aardesleutel
-inventory.caption.item_17_1	Appeltaart
-inventory.caption.item_17_2	Goud Lingots
-inventory.caption.item_17_3	Edelweiss
-inventory.caption.item_17_4	Beensleutel
-inventory.caption.item_18_1	Zwemvinnen
-inventory.caption.item_19_1	Magische Cape
-
-inventory.caption.item_21_1	Ijzersleutel
-inventory.caption.item_22_1	Steensleutel
-inventory.caption.item_23_1	Houtsleutel
-inventory.caption.item_24_1	Ijssleutel
-inventory.caption.item_25_1	Ijzere Handschoen
-inventory.caption.item_25_2	Goude Handschoen
-inventory.caption.item_26_1	Vuurstenen
-
-# Options submenu
-options.caption.press_action_change_mode	Druk op Actie om de$mode te veranderen
-options.caption.press_action_customize_key	Druk op Actie om$de toets te config.
-options.caption.press_key			Druk op een toets v.$de klavier of de joypad
-# name of the video modes (maximum 26 characters)
-options.video_mode_0				Venster 640x480
-options.video_mode_1				Venster 640x480 glad
-options.video_mode_2				Venster 320x240
-options.video_mode_3				Vol scherm uitgetrokken
-options.video_mode_4				Vol scherm uitget. (breed)
-options.video_mode_5				Vol scherm glad
-options.video_mode_6				Vol scherm glad (breed)
-options.video_mode_7				Vol scherm gecentreerd
-options.video_mode_8				Vol scherm gecent. (breed)
-# column headers of the keyboard/joypad customization table (maximum 10 characters)
-options.commands_column				Instructies
-options.keyboard_column				Klavier
-options.joypad_column				Joypad
-
-# Game controls customization (maximum 10 characters)
-controls.game_key_1		Actie
-controls.game_key_2		Zwaard
-controls.game_key_3		L. voorw.
-controls.game_key_4		R. voorw.
-controls.game_key_5		Pauze
-controls.game_key_6		Rechts
-controls.game_key_7		Boven
-controls.game_key_8		Links
-controls.game_key_9		Beneden
-
-# Dialog to save the game
-save_dialog.yes			Ja
-save_dialog.no			Nee
-save_dialog.save_question_0	Wilt u uw 
-save_dialog.save_question_1	voorderingen opslaan ?
-save_dialog.continue_question_0	Wilt u met de spel
-save_dialog.continue_question_1	doorgaan ?
-
-# Savegame selection menu (maximum 45 characters)
-selection_menu.select_file	Gelieve u een bestand te kiezen.
-selection_menu.choose_mode	Gelieve u een speelmode te kiezen.
-selection_menu.choose_name	Wat is uw naam ?
-selection_menu.confirm_erase	Bent u zeker ?
-selection_menu.erase_file	Welke bestand wilt u wissen ?
-selection_menu.erase		Wissen
-selection_menu.cancel		Annuleren
-selection_menu.exit		Verlaten
-selection_menu.big_yes		JA
-selection_menu.big_no		NEE
-selection_menu.empty		Leeg
-
-# Title screen
-title_screen.website		www.zelda-solarus.com
-title_screen.press_space	Druk op de spatiebalk
-

zsdx-1.11.0.tar.gz/data/sounds/solarus_logo.ogg Deleted

zsdx-1.11.0.tar.gz/work/105.with_separators.dat Deleted

@@ -1,22471 +0,0 @@
-properties{
-  x = 0,
-  y = 0,
-  width = 2576,
-  height = 2320,
-  world = "dungeon_9",
-  floor = 0,
-  tileset = "15",
-  music = "southern_shrine",
-}
-
-tile{
-  layer = 0,
-  x = 1032,
-  y = 1608,
-  width = 64,
-  height = 128,
-  pattern = 537,
-}
-
-tile{
-  layer = 0,
-  x = 1096,
-  y = 1608,
-  width = 8,
-  height = 128,
-  pattern = 314,
-}
-
-tile{
-  layer = 0,
-  x = 1984,
-  y = 320,
-  width = 208,
-  height = 400,
-  pattern = 303,
-}
-
-tile{
-  layer = 0,
-  x = 1352,
-  y = 840,
-  width = 512,
-  height = 128,
-  pattern = 537,
-}
-
-tile{
-  layer = 0,
-  x = 1344,
-  y = 320,
-  width = 528,
-  height = 352,
-  pattern = 303,
-}
-
-tile{
-  layer = 0,
-  x = 1320,
-  y = 296,
-  width = 24,
-  height = 24,
-  pattern = 57,
-}
-
-tile{
-  layer = 0,
-  x = 1320,
-  y = 320,
-  width = 24,
-  height = 352,
-  pattern = 235,
-}
-
-tile{
-  layer = 0,
-  x = 1344,
-  y = 296,
-  width = 528,
-  height = 24,
-  pattern = 232,
-}
-
-tile{
-  layer = 0,
-  x = 1568,
-  y = 320,
-  width = 80,
-  height = 80,
-  pattern = 537,
-}
-
-tile{
-  layer = 0,
-  x = 1344,
-  y = 320,
-  width = 16,
-  height = 16,
-  pattern = 255,
-}
-
-tile{
-  layer = 0,
-  x = 1344,
-  y = 336,
-  width = 16,
-  height = 320,
-  pattern = 260,
-}
-
-tile{
-  layer = 0,
-  x = 1360,
-  y = 320,
-  width = 208,
-  height = 16,
-  pattern = 259,
-}
-
-tile{
-  layer = 0,
-  x = 1872,
-  y = 296,
-  width = 24,
-  height = 24,
-  pattern = 58,
-}
-
-tile{
-  layer = 0,
-  x = 1872,
-  y = 320,
-  width = 24,
-  height = 352,
-  pattern = 233,
-}
-
-tile{
-  layer = 0,
-  x = 1856,
-  y = 320,
-  width = 16,
-  height = 16,
-  pattern = 256,
-}
-
-tile{
-  layer = 0,
-  x = 1648,
-  y = 320,
-  width = 208,
-  height = 16,
-  pattern = 259,
-}
-
-tile{
-  layer = 0,
-  x = 1856,
-  y = 336,
-  width = 16,
-  height = 320,
-  pattern = 261,
-}
-
-tile{
-  layer = 0,
-  x = 1568,
-  y = 320,
-  width = 80,
-  height = 8,
-  pattern = 311,
-}
-
-tile{
-  layer = 0,
-  x = 1472,
-  y = 576,
-  width = 64,
-  height = 48,
-  pattern = 537,
-}
-
-tile{
-  layer = 0,
-  x = 1488,
-  y = 432,
-  width = 32,
-  height = 144,
-  pattern = 537,
-}
-
-tile{
-  layer = 0,
-  x = 1472,
-  y = 384,
-  width = 64,
-  height = 48,
-  pattern = 537,
-}

zsdx-1.11.0.tar.gz/CMakeLists.txt -> zsdx-1.12.0.tar.xz/CMakeLists.txt Changed

@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 2.6)
-project(ZSDX)
+project(ZSDX NONE)
 
 set(quest_name "zsdx")
 
@@ -25,8 +25,11 @@
   ${CMAKE_CURRENT_SOURCE_DIR}/data/*.ttf
   ${CMAKE_CURRENT_SOURCE_DIR}/data/*.ttc
   ${CMAKE_CURRENT_SOURCE_DIR}/data/*.fon
+  ${CMAKE_CURRENT_SOURCE_DIR}/data/*.glsl
 )
 
+list(SORT data_files)
+
 file(GLOB_RECURSE data_files_prefixed
   RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}/data/*.spc
@@ -38,8 +41,11 @@
   ${CMAKE_CURRENT_SOURCE_DIR}/data/*.ttf
   ${CMAKE_CURRENT_SOURCE_DIR}/data/*.ttc
   ${CMAKE_CURRENT_SOURCE_DIR}/data/*.fon
+  ${CMAKE_CURRENT_SOURCE_DIR}/data/*.glsl
 )
 
+list(SORT data_files_prefixed)
+
 # add other data to zip archive
 add_custom_command(
   OUTPUT data.solarus
@@ -57,7 +63,7 @@
 add_custom_command(
   OUTPUT ${quest_name}
   COMMAND echo '\#!/bin/sh' > ${quest_name}
-  COMMAND echo 'solarus-run ${SOLARUS_INSTALL_ABSOLUTE_DATADIR}/${quest_name} $*' >> ${quest_name}
+  COMMAND echo 'solarus-run ${SOLARUS_INSTALL_ABSOLUTE_DATADIR}/${quest_name} $$*' >> ${quest_name}
 )
 add_custom_target(${quest_name}_command
   ALL
@@ -74,3 +80,32 @@
   DESTINATION ${SOLARUS_INSTALL_BINDIR}
 )
 
+# FreeDesktop compatible icons
+if(UNIX AND NOT APPLE)
+  install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/logos/icon_16.png
+    DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/16x16/apps RENAME zsdx.png)
+  install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/logos/icon_24.png
+    DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/24x24/apps RENAME zsdx.png)
+  install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/logos/icon_32.png
+    DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/32x32/apps RENAME zsdx.png)
+  install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/logos/icon_48.png
+    DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/48x48/apps RENAME zsdx.png)
+  install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/logos/icon_64.png
+    DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/64x64/apps RENAME zsdx.png)
+  install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/logos/icon_128.png
+    DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/128x128/apps RENAME zsdx.png)
+  install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/logos/icon_256.png
+    DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/256x256/apps RENAME zsdx.png)
+  install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/logos/icon_512.png
+    DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/512x512/apps RENAME zsdx.png)
+  install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/logos/icon_1024.png
+    DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/1024x1024/apps RENAME zsdx.png)
+  install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/logos/logo_2x.png
+    DESTINATION ${CMAKE_INSTALL_PREFIX}/share/pixmaps RENAME zsdx.png)
+endif(UNIX AND NOT APPLE)
+
+# FreeDesktop compatible start menu launcher
+if(UNIX AND NOT APPLE)
+  install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/zsdx.desktop
+    DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications)
+endif(UNIX AND NOT APPLE)

zsdx-1.11.0.tar.gz/build/win32/setup/zsdx.iss -> zsdx-1.12.0.tar.xz/build/win32/setup/zsdx.iss Changed

zsdx-1.11.0.tar.gz/changelog.txt -> zsdx-1.12.0.tar.xz/changelog.txt Changed

@@ -1,17 +1,24 @@
-zsdx 1.11.0 (2016-07-27)
+Zelda Mystery of Solarus DX 1.12.0 (2018-12-22)
+
+* Upgrade to Solarus 1.6.
+* Add the Solarus team logo.
+* Change the sound of the Solarus logo.
+* Fix typos in French dialogs (thanks Renkineko).
+
+Zelda Mystery of Solarus DX 1.11.0 (2016-07-27)
 
 * Upgrade to Solarus 1.5.
 * Fix wrong layer when leaving dungeon 10.
 * Dungeon 2: Fix sound played twice when activating the statues.
-* Dungeon 9: fix geting back to room entrance when touching spikes.
+* Dungeon 9: fix getting back to room entrance when touching spikes.
 * English dialogs: rename Pegasus Shoes to Pegasus Boots.
 
-zsdx 1.10.3 (2015-12-20)
+Zelda Mystery of Solarus DX 1.10.3 (2015-12-20)
 
 * Fix Italian dialogs exceeding the dialog box (thanks Marco).
 * Fix game-over stopped sometimes using a workaround (#87).
 
-zsdx 1.10.2 (2015-11-22)
+Zelda Mystery of Solarus DX 1.10.2 (2015-11-22)
 
 * Upgrade to Solarus 1.4.5.
 * Add Italian translation (thanks Marco).
@@ -23,11 +30,11 @@
 * Dungeon 10: fix evil tiles door not opening sometimes (#94).
 * End screen: fix freezing the hero (#109).
 
-zsdx 1.10.1 (2015-05-09)
+Zelda Mystery of Solarus DX 1.10.1 (2015-05-09)
 
 * Upgrade to Solarus 1.4.1.
 
-zsdx 1.10.0 (2015-05-02)
+Zelda Mystery of Solarus DX 1.10.0 (2015-05-02)
 
 * Upgrade to Solarus 1.4.0.
 * Fix a minor tile issue in dungeon 8 entrance.
@@ -38,7 +45,7 @@
 * Dungeon 5: fix a missing door on the minimap (#99).
 * Dungeon 9: don't allow to skip the boss hint dialog (#93).
 
-zsdx 1.9.0 (2014-08-21)
+Zelda Mystery of Solarus DX 1.9.0 (2014-08-21)
 
 * Use Solarus 1.3.0.
 * New world minimap. By Neovyse.
@@ -46,21 +53,21 @@
 * Fix direction of vertical movement on joypad in menus (#85). By xethm55.
 * Clarify license of some files.
 
-zsdx 1.8.0 (2014-05-06)
+Zelda Mystery of Solarus DX 1.8.0 (2014-05-06)
 
 * Use solarus 1.2.0.
 * Replace fixed8.fon by a TTF font due to an SDL2 regression (#59).
 * Switch fullscreen also with F11.
 * Dungeon 3 5F: fix falling too early in the hole due to incorrect layers.
 
-zsdx-1.7.1 (2013-12-01)
+Zelda Mystery of Solarus DX 1.7.1 (2013-12-01)
 
 * Use Solarus 1.1.1.
 * Fix the heart meter not updated until the first save/reload (#67).
 * Fix wrong teletransportation in Billy's cave after falling in a hole (#66).
 * Fix the debugging console no longer working after using F1, F2 or F3.
 
-zsdx-1.7.0 (2013-10-13)
+Zelda Mystery of Solarus DX 1.7.0 (2013-10-13)
 
 * Use solarus 1.1.0.
 * Add simplified Chinese and traditional Chinese translations (beta).
@@ -79,16 +86,16 @@
 * Dungeon 2 boss: fix tile disappearing issue (#14).
 * Dungeon 9 2F: fix a minor graphical issue.
 
-zsdx-1.6.2 (2013-06-25)
+Zelda Mystery of Solarus DX 1.6.2 (2013-06-25)
 
 * Use solarus 1.0.4.
 * Fix line errors in English dialogs.
 
-zsdx-1.6.1 (2013-06-25)
+Zelda Mystery of Solarus DX 1.6.1 (2013-06-25)
 
 * Use solarus 1.0.3.
 
-zsdx-1.6 (2013-06-22)
+Zelda Mystery of Solarus DX 1.6 (2013-06-22)
 
 * Use solarus 1.0.2.
 * Improve the English translation.
@@ -106,7 +113,7 @@
 * Dungeon 8 B1: fix a minor tile error (#2).
 * Dungeon 8 B3: fix a minor tile error.
 
-zsdx-1.5.2 (2013-05-08)
+Zelda Mystery of Solarus DX 1.5.2 (2013-05-08)
 
 * Use solarus 0.9.3.
 * German dialogs available.
@@ -119,7 +126,7 @@
 * Dungeon 5: fix an error the Spanish translation (thanks Joan).
 * Fix the CMake script that creates the zip archive (#1).
 
-zsdx-1.5.1 (2012-05-20)
+Zelda Mystery of Solarus DX 1.5.1 (2012-05-20)
 
 * Spanish dialogs available (beta)
 * English dialogs: fix dialogs with questions
@@ -136,18 +143,18 @@
 * Savegame variable 0 was used twice (no consequence)
 * Always set the variant of _none and _random treasures to 1
 
-zsdx-1.5.0 (2012-04-03)
+Zelda Mystery of Solarus DX 1.5.0 (2012-04-03)
 
 * Use solarus 0.9.2
 * English translation available
 * Dungeon 5: the piece of heart could be obtained very easily with the sword
 * Dungeon 5: a black guard was never seeing the hero
 
-zsdx-1.4.1 (2012-02-18)
+Zelda Mystery of Solarus DX 1.4.1 (2012-02-18)
 
 * Dungeon 5: fix wrong coordinates of two blocks saved
 
-zsdx-1.4 (2012-02-12)
+Zelda Mystery of Solarus DX 1.4 (2012-02-12)
 
 * Use solarus-0.9.1
 * The Pegasus Shoes can now be used with the action key
@@ -188,7 +195,7 @@
 * Smith cave: change the price of the sword (75 instead of 80)
 * Various minor improvements
 
-zsdx-1.3 (2011-12-23)
+Zelda Mystery of Solarus DX 1.3 (2011-12-23)
 
 * Use solarus-0.9.0 (changelogs of solarus and zsdx will now be separated)
 * Dungeon 7: fix a possible crash with statues and pikes
@@ -196,7 +203,7 @@
 * Don't play the sound of pikes too frequently when they don't have much space
 * After the boss of dungeon 10, re-enable enemies of the map
 
-zsdx-1.2 (2011-12-21)
+Zelda Mystery of Solarus DX 1.2 (2011-12-21)
 
 * Dungeon 9: fix a crash with two enemies that appear on a platform
 * Attempt to fix a crash with mummies by removing a useless and buggy feature
@@ -205,7 +212,7 @@
 * Dungeon 1: fix the fixed minillosaur eggs
 * Small map improvements
 
-zsdx-1.1 (2011-12-19)
+Zelda Mystery of Solarus DX 1.1 (2011-12-19)
 
 * Fix a crash when jumping from grass into a hole
 * Fix a possible crash when buying potions
@@ -220,7 +227,7 @@
 * Minor map improvements
 * Update copyright info
 
-zsdx-1.0 (2011-12-16)
+Zelda Mystery of Solarus DX 1.0 (2011-12-16)
 
 * Initial release of Zelda Mystery of Solarus DX

zsdx-1.11.0.tar.gz/data/dungeons.lua -> zsdx-1.12.0.tar.xz/data/dungeons.lua Changed

@@ -1,168 +1,169 @@
-local game = ...
-
--- Define the existing dungeons and their floors for the minimap menu.
-game.dungeons = {
-  [1] = {
-    floor_width = 1040,
-    floor_height = 696,
-    lowest_floor = -1,
-    highest_floor = 1,
-    maps = { "23", "24", "25", "27" },
-    boss = {
-      floor = -1,
-      x = 648,
-      y = 144,
-      savegame_variable = "b63",
+return function(game)
+
+  -- Define the existing dungeons and their floors for the minimap menu.
+  game.dungeons = {
+    [1] = {
+      floor_width = 1040,
+      floor_height = 696,
+      lowest_floor = -1,
+      highest_floor = 1,
+      maps = { "23", "24", "25", "27" },
+      boss = {
+        floor = -1,
+        x = 648,
+        y = 144,
+        savegame_variable = "b63",
+      },
     },
-  },
-  [2] = {
-    floor_width = 1152,
-    floor_height = 768,
-    lowest_floor = -1,
-    highest_floor = 0,
-    maps = { "30", "31" },
-    boss = {
-      floor = -1,
-      x = 960,
-      y = 365,
-      savegame_variable = "b93",
+    [2] = {
+      floor_width = 1152,
+      floor_height = 768,
+      lowest_floor = -1,
+      highest_floor = 0,
+      maps = { "30", "31" },
+      boss = {
+        floor = -1,
+        x = 960,
+        y = 365,
+        savegame_variable = "b93",
+      },
     },
-  },
-  [3] = {
-    floor_width = 1024,
-    floor_height = 1024,
-    lowest_floor = 0,
-    highest_floor = 4,
-    maps = { "40", "41", "42", "43", "85" },
-    boss = {
-      floor = 3,
-      x = 252,
-      y = 533,
-      savegame_variable = "b902",
+    [3] = {
+      floor_width = 1024,
+      floor_height = 1024,
+      lowest_floor = 0,
+      highest_floor = 4,
+      maps = { "40", "41", "42", "43", "85" },
+      boss = {
+        floor = 3,
+        x = 252,
+        y = 533,
+        savegame_variable = "b902",
+      },
     },
-  },
-  [4] = {
-    floor_width = 960,
-    floor_height = 1120,
-    lowest_floor = -1,
-    highest_floor = 0,
-    maps = { "59", "60", "62" },
-    boss = {
-      floor = 0,
-      x = 200,
-      y = 464,
-      savegame_variable = "b415",
+    [4] = {
+      floor_width = 960,
+      floor_height = 1120,
+      lowest_floor = -1,
+      highest_floor = 0,
+      maps = { "59", "60", "62" },
+      boss = {
+        floor = 0,
+        x = 200,
+        y = 464,
+        savegame_variable = "b415",
+      },
     },
-  },
-  [5] = {
-    floor_width = 1152,
-    floor_height = 1216,
-    lowest_floor = -1,
-    highest_floor = 1,
-    maps = { "63", "64", "65" },
-  },
-  [6] = {
-    floor_width = 1152,
-    floor_height = 768,
-    lowest_floor = 0,
-    highest_floor = 3,
-    maps = { "55", "56", "57", "58" },
-    boss = {
-      floor = 3,
-      x = 272,
-      y = 224,
-      savegame_variable = "b321",
+    [5] = {
+      floor_width = 1152,
+      floor_height = 1216,
+      lowest_floor = -1,
+      highest_floor = 1,
+      maps = { "63", "64", "65" },
     },
-  },
-  [7] = {
-    floor_width = 1104,
-    floor_height = 1056,
-    lowest_floor = 0,
-    highest_floor = 2,
-    maps = { "101", "102", "103" },
-    boss = {
-      floor = 2,
-      x = 544,
-      y = 784,
-      savegame_variable = "b625",
+    [6] = {
+      floor_width = 1152,
+      floor_height = 768,
+      lowest_floor = 0,
+      highest_floor = 3,
+      maps = { "55", "56", "57", "58" },
+      boss = {
+        floor = 3,
+        x = 272,
+        y = 224,
+        savegame_variable = "b321",
+      },
     },
-  },
-  [8] = {
-    floor_width = 2256,
-    floor_height = 1808,
-    lowest_floor = -4,
-    highest_floor = 0,
-    maps = { "47", "48", "49", "50", "51", "52", "53" },
-    boss = {
-      floor = 0,
-      x = 1128,
-      y = 125,
-      savegame_variable = "b727",
+    [7] = {
+      floor_width = 1104,
+      floor_height = 1056,
+      lowest_floor = 0,
+      highest_floor = 2,
+      maps = { "101", "102", "103" },
+      boss = {
+        floor = 2,
+        x = 544,
+        y = 784,
+        savegame_variable = "b625",
+      },
     },
-  },
-  [9] = {
-    floor_width = 2576,
-    floor_height = 2320,
-    lowest_floor = -1,
-    highest_floor = 3,
-    maps = { "104", "105", "106", "107", "108", "109", "110", "130" },
-  },
-  [10] = {
-    floor_width = 1032,
-    floor_height = 1032,
-    lowest_floor = -1,
-    highest_floor = 4,
-    maps = { "17", "97", "98", "99" },
-  },
-}

zsdx-1.11.0.tar.gz/data/enemies/bee_guard.lua -> zsdx-1.12.0.tar.xz/data/enemies/bee_guard.lua Changed

zsdx-1.11.0.tar.gz/data/enemies/blue_bullblin.lua -> zsdx-1.12.0.tar.xz/data/enemies/blue_bullblin.lua Changed

zsdx-1.11.0.tar.gz/data/enemies/blue_dogman.lua -> zsdx-1.12.0.tar.xz/data/enemies/blue_dogman.lua Changed

zsdx-1.11.0.tar.gz/data/enemies/blue_duck_soldier.lua -> zsdx-1.12.0.tar.xz/data/enemies/blue_duck_soldier.lua Changed

zsdx-1.11.0.tar.gz/data/enemies/blue_hardhat_beetle.lua -> zsdx-1.12.0.tar.xz/data/enemies/blue_hardhat_beetle.lua Changed

zsdx-1.11.0.tar.gz/data/enemies/blue_knight_soldier.lua -> zsdx-1.12.0.tar.xz/data/enemies/blue_knight_soldier.lua Changed

zsdx-1.11.0.tar.gz/data/enemies/blue_pig_soldier.lua -> zsdx-1.12.0.tar.xz/data/enemies/blue_pig_soldier.lua Changed

zsdx-1.11.0.tar.gz/data/enemies/bubble.lua -> zsdx-1.12.0.tar.xz/data/enemies/bubble.lua Changed

zsdx-1.11.0.tar.gz/data/enemies/generic_soldier.lua -> zsdx-1.12.0.tar.xz/data/enemies/generic_soldier.lua Changed

@@ -1,12 +1,11 @@
-local enemy = ...
-
 -- Generic script for an enemy with a sword
 -- that goes towards the hero if he sees him
 -- and walks randomly otherwise.
 
 -- Example of use from an enemy script:
 
--- sol.main.load_file("enemies/generic_soldier")(enemy)
+-- local init_enemy = require("enemies/generic_soldier")
+-- init_enemy(enemy)
 -- enemy:set_properties({
 --   main_sprite = "enemies/green_knight_soldier",
 --   sword_sprite = "enemies/green_knight_soldier_sword",
@@ -21,135 +20,137 @@
 -- The parameter of set_properties() is a table.
 -- Its values are all optional except main_sprite
 -- and sword_sprite.
+return function(enemy)
 
-local properties = {}
-local going_hero = false
-local being_pushed = false
-local main_sprite = nil
-local sword_sprite = nil
+  local properties = {}
+  local going_hero = false
+  local being_pushed = false
+  local main_sprite = nil
+  local sword_sprite = nil
 
-function enemy:set_properties(prop)
+  function enemy:set_properties(prop)
 
-  properties = prop
-  -- Set default values.
-  if properties.life == nil then
-    properties.life = 2
-  end
-  if properties.damage == nil then
-    properties.damage = 2
-  end
-  if properties.play_hero_seen_sound == nil then
-    properties.play_hero_seen_sound = false
-  end
-  if properties.normal_speed == nil then
-    properties.normal_speed = 32
-  end
-  if properties.faster_speed == nil then
-    properties.faster_speed = 64
+    properties = prop
+    -- Set default values.
+    if properties.life == nil then
+      properties.life = 2
+    end
+    if properties.damage == nil then
+      properties.damage = 2
+    end
+    if properties.play_hero_seen_sound == nil then
+      properties.play_hero_seen_sound = false
+    end
+    if properties.normal_speed == nil then
+      properties.normal_speed = 32
+    end
+    if properties.faster_speed == nil then
+      properties.faster_speed = 64
+    end
+    if properties.hurt_style == nil then
+      properties.hurt_style = "normal"
+    end
   end
-  if properties.hurt_style == nil then
-    properties.hurt_style = "normal"
+
+  function enemy:on_created()
+
+    self:set_life(properties.life)
+    self:set_damage(properties.damage)
+    self:set_hurt_style(properties.hurt_style)
+    sword_sprite = self:create_sprite(properties.sword_sprite)
+    main_sprite = self:create_sprite(properties.main_sprite)
+    self:set_size(16, 16)
+    self:set_origin(8, 13)
+
+    self:set_invincible_sprite(sword_sprite)
+    self:set_attack_consequence_sprite(sword_sprite, "sword", "custom")
   end
-end
 
-function enemy:on_created()
+  function enemy:on_restarted()
 
-  self:set_life(properties.life)
-  self:set_damage(properties.damage)
-  self:set_hurt_style(properties.hurt_style)
-  sword_sprite = self:create_sprite(properties.sword_sprite)
-  main_sprite = self:create_sprite(properties.main_sprite)
-  self:set_size(16, 16)
-  self:set_origin(8, 13)
+    if not being_pushed then
+      if going_hero then
+        self:go_hero()
+      else
+        self:go_random()
+        self:check_hero()
+      end
+    end
+  end
 
-  self:set_invincible_sprite(sword_sprite)
-  self:set_attack_consequence_sprite(sword_sprite, "sword", "custom")
-end
+  function enemy:check_hero()
 
-function enemy:on_restarted()
+    local hero = self:get_map():get_entity("hero")
+    local _, _, layer = self:get_position()
+    local _, _, hero_layer = hero:get_position()
+    local near_hero = layer == hero_layer
+      and self:get_distance(hero) < 100
 
-  if not being_pushed then
-    if going_hero then
+    if near_hero and not going_hero then
+      if properties.play_hero_seen_sound then
+        sol.audio.play_sound("hero_seen")
+      end
       self:go_hero()
-    else
+    elseif not near_hero and going_hero then
       self:go_random()
-      self:check_hero()
     end
+    sol.timer.stop_all(self)
+    sol.timer.start(self, 1000, function() self:check_hero() end)
   end
-end
-
-function enemy:check_hero()
 
-  local hero = self:get_map():get_entity("hero")
-  local _, _, layer = self:get_position()
-  local _, _, hero_layer = hero:get_position()
-  local near_hero = layer == hero_layer
-    and self:get_distance(hero) < 100
+  function enemy:on_movement_changed(movement)
 
-  if near_hero and not going_hero then
-    if properties.play_hero_seen_sound then
-      sol.audio.play_sound("hero_seen")
+    if not being_pushed then
+      local direction4 = movement:get_direction4()
+      main_sprite:set_direction(direction4)
+      sword_sprite:set_direction(direction4)
     end
-    self:go_hero()
-  elseif not near_hero and going_hero then
-    self:go_random()
   end
-  sol.timer.stop_all(self)
-  sol.timer.start(self, 1000, function() self:check_hero() end)
-end
 
-function enemy:on_movement_changed(movement)
+  function enemy:on_movement_finished(movement)
 
-  if not being_pushed then
-    local direction4 = movement:get_direction4()
-    main_sprite:set_direction(direction4)
-    sword_sprite:set_direction(direction4)
+    if being_pushed then
+      self:go_hero()
+    end
   end
-end
 
-function enemy:on_movement_finished(movement)
+  function enemy:on_obstacle_reached(movement)
 
-  if being_pushed then
-    self:go_hero()
+    if being_pushed then
+      self:go_hero()
+    end
   end
-end
 
-function enemy:on_obstacle_reached(movement)
-
-  if being_pushed then
-    self:go_hero()
+  function enemy:on_custom_attack_received(attack, sprite)
+
+    if attack == "sword" and sprite == sword_sprite then
+      sol.audio.play_sound("sword_tapping")
+      being_pushed = true
+      local x, y = self:get_position()
+      local angle = self:get_angle(self:get_map():get_entity("hero")) + math.pi
+      local movement = sol.movement.create("straight")

zsdx-1.11.0.tar.gz/data/enemies/generic_towards_hero.lua -> zsdx-1.12.0.tar.xz/data/enemies/generic_towards_hero.lua Changed

@@ -1,5 +1,3 @@
-local enemy = ...
-
 -- Generic script for an enemy that goes towards the
 -- the hero if he sees him, and walks randomly otherwise.
 -- The enemy has only one sprite. See generic_soldier.lua
@@ -7,7 +5,8 @@
 
 -- Example of use from an enemy script:
 
--- sol.main.load_file("enemies/generic_towards_hero")(enemy)
+-- local init_enemy = require("enemies/generic_towards_hero")
+-- init_enemy(enemy)
 -- enemy:set_properties({
 --   sprite = "enemies/globul",
 --   life = 4,
@@ -25,104 +24,106 @@
 
 -- The parameter of set_properties() is a table.
 -- Its values are all optional except the sprite.
+return function(enemy)
 
-local properties = {}
-local going_hero = false
+  local properties = {}
+  local going_hero = false
 
-function enemy:set_properties(prop)
+  function enemy:set_properties(prop)
 
-  properties = prop
-  -- set default values
-  if properties.life == nil then
-    properties.life = 2
-  end
-  if properties.damage == nil then
-    properties.damage = 2
-  end
-  if properties.normal_speed == nil then
-    properties.normal_speed = 32
-  end
-  if properties.faster_speed == nil then
-    properties.faster_speed = 48
-  end
-  if properties.hurt_style == nil then
-    properties.hurt_style = "normal"
-  end
-  if properties.pushed_when_hurt == nil then
-    properties.pushed_when_hurt = true
-  end
-  if properties.push_hero_on_sword == nil then
-    properties.push_hero_on_sword = false
-  end
-  if properties.movement_create == nil then
-    properties.movement_create = function()
-      local m = sol.movement.create("random_path")
-      return m
+    properties = prop
+    -- set default values
+    if properties.life == nil then
+      properties.life = 2
+    end
+    if properties.damage == nil then
+      properties.damage = 2
+    end
+    if properties.normal_speed == nil then
+      properties.normal_speed = 32
+    end
+    if properties.faster_speed == nil then
+      properties.faster_speed = 48
+    end
+    if properties.hurt_style == nil then
+      properties.hurt_style = "normal"
+    end
+    if properties.pushed_when_hurt == nil then
+      properties.pushed_when_hurt = true
+    end
+    if properties.push_hero_on_sword == nil then
+      properties.push_hero_on_sword = false
+    end
+    if properties.movement_create == nil then
+      properties.movement_create = function()
+        local m = sol.movement.create("random_path")
+        return m
+      end
     end
   end
-end
 
-function enemy:on_created()
+  function enemy:on_created()
 
-  self:set_life(properties.life)
-  self:set_damage(properties.damage)
-  self:create_sprite(properties.sprite)
-  self:set_hurt_style(properties.hurt_style)
-  self:set_pushed_back_when_hurt(properties.pushed_when_hurt)
-  self:set_push_hero_on_sword(properties.push_hero_on_sword)
-  self:set_size(16, 16)
-  self:set_origin(8, 13)
-end
+    self:set_life(properties.life)
+    self:set_damage(properties.damage)
+    self:create_sprite(properties.sprite)
+    self:set_hurt_style(properties.hurt_style)
+    self:set_pushed_back_when_hurt(properties.pushed_when_hurt)
+    self:set_push_hero_on_sword(properties.push_hero_on_sword)
+    self:set_size(16, 16)
+    self:set_origin(8, 13)
+  end
 
-function enemy:on_movement_changed(movement)
+  function enemy:on_movement_changed(movement)
 
-  local direction4 = movement:get_direction4()
-  local sprite = self:get_sprite()
-  sprite:set_direction(direction4)
-end
+    local direction4 = movement:get_direction4()
+    local sprite = self:get_sprite()
+    sprite:set_direction(direction4)
+  end
 
-function enemy:on_obstacle_reached(movement)
+  function enemy:on_obstacle_reached(movement)
 
-  if not going_hero then
+    if not going_hero then
+      self:go_random()
+      self:check_hero()
+    end
+  end
+
+  function enemy:on_restarted()
     self:go_random()
     self:check_hero()
   end
-end
 
-function enemy:on_restarted()
-  self:go_random()
-  self:check_hero()
-end
+  function enemy:check_hero()
 
-function enemy:check_hero()
+    local hero = self:get_map():get_entity("hero")
+    local _, _, layer = self:get_position()
+    local _, _, hero_layer = hero:get_position()
+    local near_hero = layer == hero_layer
+      and self:get_distance(hero) < 100
 
-  local hero = self:get_map():get_entity("hero")
-  local _, _, layer = self:get_position()
-  local _, _, hero_layer = hero:get_position()
-  local near_hero = layer == hero_layer
-    and self:get_distance(hero) < 100
+    if near_hero and not going_hero then
+      self:go_hero()
+    elseif not near_hero and going_hero then
+      self:go_random()
+    end
 
-  if near_hero and not going_hero then
-    self:go_hero()
-  elseif not near_hero and going_hero then
-    self:go_random()
+    sol.timer.stop_all(self)
+    sol.timer.start(self, 100, function() self:check_hero() end)
   end
 
-  sol.timer.stop_all(self)
-  sol.timer.start(self, 100, function() self:check_hero() end)
-end
+  function enemy:go_random()
+    local m = properties.movement_create()
+    m:set_speed(properties.normal_speed)
+    m:start(self)
+    going_hero = false
+  end
 
-function enemy:go_random()
-  local m = properties.movement_create()
-  m:set_speed(properties.normal_speed)
-  m:start(self)
-  going_hero = false
-end
+  function enemy:go_hero()
+    local m = sol.movement.create("target")
+    m:set_speed(properties.faster_speed)
+    m:start(self)
+    going_hero = true
+  end
 
-function enemy:go_hero()
-  local m = sol.movement.create("target")
-  m:set_speed(properties.faster_speed)
-  m:start(self)
-  going_hero = true
 end

zsdx-1.11.0.tar.gz/data/enemies/generic_waiting_for_hero.lua -> zsdx-1.12.0.tar.xz/data/enemies/generic_waiting_for_hero.lua Changed

@@ -1,5 +1,3 @@
-local enemy = ...
-
 -- Generic script for an enemy that is in a sleep state,
 -- and goes towards the the hero when he sees him,
 -- and then goes randomly if it loses sight.
@@ -9,7 +7,8 @@
 
 -- Example of use from an enemy script:
 
--- sol.main.load_file("enemies/generic_waiting_for_hero")(enemy)
+-- local init_enemy = require("enemies/generic_waiting_for_hero")
+-- init_enemy(enemy)
 -- enemy:set_properties({
 --   sprite = "enemies/globul",
 --   life = 4,
@@ -28,147 +27,149 @@
 
 -- The parameter of set_properties() is a table.
 -- Its values are all optional except the sprites.
+return function(enemy)
 
-local properties = {}
-local going_hero = false
-local awaken = false
+  local properties = {}
+  local going_hero = false
+  local awaken = false
 
-function enemy:set_properties(prop)
+  function enemy:set_properties(prop)
 
-  properties = prop
-  -- Set default values.
-  if properties.life == nil then
-    properties.life = 2
-  end
-  if properties.damage == nil then
-    properties.damage = 2
-  end
-  if properties.normal_speed == nil then
-    properties.normal_speed = 32
-  end
-  if properties.faster_speed == nil then
-    properties.faster_speed = 48
-  end
-  if properties.hurt_style == nil then
-    properties.hurt_style = "normal"
-  end
-  if properties.pushed_when_hurt == nil then
-    properties.pushed_when_hurt = true
-  end
-  if properties.push_hero_on_sword == nil then
-    properties.push_hero_on_sword = false
-  end
-  if properties.asleep_animation == nil then
-    properties.asleep_animation = "asleep"
-  end
-  if properties.awaking_animation == nil then
-    properties.awaking_animation = "awaking"
-  end
-  if properties.normal_animation == nil then
-    properties.normal_animation = "walking"
+    properties = prop
+    -- Set default values.
+    if properties.life == nil then
+      properties.life = 2
+    end
+    if properties.damage == nil then
+      properties.damage = 2
+    end
+    if properties.normal_speed == nil then
+      properties.normal_speed = 32
+    end
+    if properties.faster_speed == nil then
+      properties.faster_speed = 48
+    end
+    if properties.hurt_style == nil then
+      properties.hurt_style = "normal"
+    end
+    if properties.pushed_when_hurt == nil then
+      properties.pushed_when_hurt = true
+    end
+    if properties.push_hero_on_sword == nil then
+      properties.push_hero_on_sword = false
+    end
+    if properties.asleep_animation == nil then
+      properties.asleep_animation = "asleep"
+    end
+    if properties.awaking_animation == nil then
+      properties.awaking_animation = "awaking"
+    end
+    if properties.normal_animation == nil then
+      properties.normal_animation = "walking"
+    end
   end
-end
 
-function enemy:on_created()
-
-  self:set_life(properties.life)
-  self:set_damage(properties.damage)
-  self:set_hurt_style(properties.hurt_style)
-  self:set_pushed_back_when_hurt(properties.pushed_when_hurt)
-  self:set_push_hero_on_sword(properties.push_hero_on_sword)
-  self:set_invincible()
-  self:set_size(16, 16)
-  self:set_origin(8, 12)
-  if not properties.obstacle_behavior == nil then
-    self:set_obstacle_behavior(properties.obstacle_behavior)
-  end
+  function enemy:on_created()
 
-  local sprite = self:create_sprite(properties.sprite)
-  function sprite:on_animation_finished(animation)
-    -- If the awakening transition is finished, make the enemy go toward the hero.
-    if animation == properties.awaking_animation then
-      self:set_animation(properties.normal_animation)
-      enemy:set_size(16, 16)
-      enemy:set_origin(8, 13)
-      enemy:snap_to_grid()
-      enemy:set_default_attack_consequences()
-      awaken = true
-      enemy:go_hero()
+    self:set_life(properties.life)
+    self:set_damage(properties.damage)
+    self:set_hurt_style(properties.hurt_style)
+    self:set_pushed_back_when_hurt(properties.pushed_when_hurt)
+    self:set_push_hero_on_sword(properties.push_hero_on_sword)
+    self:set_invincible()
+    self:set_size(16, 16)
+    self:set_origin(8, 12)
+    if not properties.obstacle_behavior == nil then
+      self:set_obstacle_behavior(properties.obstacle_behavior)
     end
+
+    local sprite = self:create_sprite(properties.sprite)
+    function sprite:on_animation_finished(animation)
+      -- If the awakening transition is finished, make the enemy go toward the hero.
+      if animation == properties.awaking_animation then
+        self:set_animation(properties.normal_animation)
+        enemy:set_size(16, 16)
+        enemy:set_origin(8, 13)
+        enemy:snap_to_grid()
+        enemy:set_default_attack_consequences()
+        awaken = true
+        enemy:go_hero()
+      end
+    end
+    sprite:set_animation(properties.asleep_animation)
   end
-  sprite:set_animation(properties.asleep_animation)
-end
 
-function enemy:on_movement_changed(movement)
+  function enemy:on_movement_changed(movement)
 
-  local direction4 = movement:get_direction4()
-  local sprite = self:get_sprite()
-  sprite:set_direction(direction4)
-end
+    local direction4 = movement:get_direction4()
+    local sprite = self:get_sprite()
+    sprite:set_direction(direction4)
+  end
 
-function enemy:on_obstacle_reached(movement)
+  function enemy:on_obstacle_reached(movement)
 
-  if awaken and not going_hero then
-    self:check_hero()
+    if awaken and not going_hero then
+      self:check_hero()
+    end
   end
-end
 
-function enemy:on_restarted()
+  function enemy:on_restarted()
 
-  if not awaken then
-    local sprite = self:get_sprite()
-    sprite:set_animation(properties.asleep_animation)
-  else
-    self:go_hero()
+    if not awaken then
+      local sprite = self:get_sprite()
+      sprite:set_animation(properties.asleep_animation)
+    else
+      self:go_hero()
+    end
+    self:check_hero()
   end
-  self:check_hero()
-end
 
-function enemy:check_hero()
+  function enemy:check_hero()
 
-  local hero = self:get_map():get_entity("hero")

zsdx-1.11.0.tar.gz/data/enemies/gibdo.lua -> zsdx-1.12.0.tar.xz/data/enemies/gibdo.lua Changed

zsdx-1.11.0.tar.gz/data/enemies/globul.lua -> zsdx-1.12.0.tar.xz/data/enemies/globul.lua Changed

zsdx-1.11.0.tar.gz/data/enemies/green_duck_soldier.lua -> zsdx-1.12.0.tar.xz/data/enemies/green_duck_soldier.lua Changed

zsdx-1.11.0.tar.gz/data/enemies/green_knight_soldier.lua -> zsdx-1.12.0.tar.xz/data/enemies/green_knight_soldier.lua Changed

zsdx-1.11.0.tar.gz/data/enemies/lizalfos.lua -> zsdx-1.12.0.tar.xz/data/enemies/lizalfos.lua Changed

zsdx-1.11.0.tar.gz/data/enemies/mandible.lua -> zsdx-1.12.0.tar.xz/data/enemies/mandible.lua Changed

zsdx-1.11.0.tar.gz/data/enemies/minillosaur_egg_fixed.lua -> zsdx-1.12.0.tar.xz/data/enemies/minillosaur_egg_fixed.lua Changed

zsdx-1.11.0.tar.gz/data/enemies/red_bullblin.lua -> zsdx-1.12.0.tar.xz/data/enemies/red_bullblin.lua Changed

zsdx-1.11.0.tar.gz/data/enemies/red_dogman.lua -> zsdx-1.12.0.tar.xz/data/enemies/red_dogman.lua Changed

zsdx-1.11.0.tar.gz/data/enemies/red_duck_soldier.lua -> zsdx-1.12.0.tar.xz/data/enemies/red_duck_soldier.lua Changed

zsdx-1.11.0.tar.gz/data/enemies/red_hardhat_beetle.lua -> zsdx-1.12.0.tar.xz/data/enemies/red_hardhat_beetle.lua Changed

zsdx-1.11.0.tar.gz/data/enemies/red_knight_soldier.lua -> zsdx-1.12.0.tar.xz/data/enemies/red_knight_soldier.lua Changed

zsdx-1.11.0.tar.gz/data/enemies/red_pig_soldier.lua -> zsdx-1.12.0.tar.xz/data/enemies/red_pig_soldier.lua Changed

zsdx-1.11.0.tar.gz/data/enemies/ropa.lua -> zsdx-1.12.0.tar.xz/data/enemies/ropa.lua Changed

zsdx-1.11.0.tar.gz/data/enemies/skeletor.lua -> zsdx-1.12.0.tar.xz/data/enemies/skeletor.lua Changed

zsdx-1.11.0.tar.gz/data/equipment.lua -> zsdx-1.12.0.tar.xz/data/equipment.lua Changed

@@ -1,107 +1,108 @@
-local game = ...
+return function(game)
 
--- Returns whether a small key counter exists on the current map.
-function game:are_small_keys_enabled()
-  return self:get_small_keys_savegame_variable() ~= nil
-end
+  -- Returns whether a small key counter exists on the current map.
+  function game:are_small_keys_enabled()
+    return self:get_small_keys_savegame_variable() ~= nil
+  end
 
--- Returns the name of the integer variable that stores the number
--- of small keys for the current map, or nil.
-function game:get_small_keys_savegame_variable()
+  -- Returns the name of the integer variable that stores the number
+  -- of small keys for the current map, or nil.
+  function game:get_small_keys_savegame_variable()
 
-  local map = self:get_map()
+    local map = self:get_map()
 
-  if map ~= nil then
-    -- Does the map explicitely defines a small key counter?
-    if map.small_keys_savegame_variable ~= nil then
-      return map.small_keys_savegame_variable
-    end
+    if map ~= nil then
+      -- Does the map explicitely defines a small key counter?
+      if map.small_keys_savegame_variable ~= nil then
+        return map.small_keys_savegame_variable
+      end
 
-    -- Are we in a dungeon?
-    local dungeon_index = self:get_dungeon_index()
-    if dungeon_index ~= nil then
-      return "dungeon_" .. dungeon_index .. "_small_keys"
+      -- Are we in a dungeon?
+      local dungeon_index = self:get_dungeon_index()
+      if dungeon_index ~= nil then
+        return "dungeon_" .. dungeon_index .. "_small_keys"
+      end
     end
+
+    -- No small keys on this map.
+    return nil
   end
 
-  -- No small keys on this map.
-  return nil
-end
+  -- Returns whether the player has at least one small key.
+  -- Raises an error is small keys are not enabled in the current map.
+  function game:has_small_key()
 
--- Returns whether the player has at least one small key.
--- Raises an error is small keys are not enabled in the current map.
-function game:has_small_key()
+    return self:get_num_small_keys() > 0
+  end
 
-  return self:get_num_small_keys() > 0
-end
+  -- Returns the number of small keys of the player.
+  -- Raises an error is small keys are not enabled in the current map.
+  function game:get_num_small_keys()
 
--- Returns the number of small keys of the player.
--- Raises an error is small keys are not enabled in the current map.
-function game:get_num_small_keys()
+    if not self:are_small_keys_enabled() then
+      error("Small keys are not enabled in the current map")
+    end
 
-  if not self:are_small_keys_enabled() then
-    error("Small keys are not enabled in the current map")
+    local savegame_variable = self:get_small_keys_savegame_variable()
+    return self:get_value(savegame_variable) or 0
   end
 
-  local savegame_variable = self:get_small_keys_savegame_variable()
-  return self:get_value(savegame_variable) or 0
-end
+  -- Adds a small key to the player.
+  -- Raises an error is small keys are not enabled in the current map.
+  function game:add_small_key()
 
--- Adds a small key to the player.
--- Raises an error is small keys are not enabled in the current map.
-function game:add_small_key()
+    if not self:are_small_keys_enabled() then
+      error("Small keys are not enabled in the current map")
+    end
 
-  if not self:are_small_keys_enabled() then
-    error("Small keys are not enabled in the current map")
+    local savegame_variable = self:get_small_keys_savegame_variable()
+    self:set_value(savegame_variable, self:get_num_small_keys() + 1)
   end
 
-  local savegame_variable = self:get_small_keys_savegame_variable()
-  self:set_value(savegame_variable, self:get_num_small_keys() + 1)
-end
+  -- Removes a small key to the player.
+  -- Raises an error is small keys are not enabled in the current map
+  -- or if the player has no small keys.
+  function game:remove_small_key()
 
--- Removes a small key to the player.
--- Raises an error is small keys are not enabled in the current map
--- or if the player has no small keys.
-function game:remove_small_key()
+    if not self:has_small_key() then
+      error("The player has no small key")
+    end
 
-  if not self:has_small_key() then
-    error("The player has no small key")
+    local savegame_variable = self:get_small_keys_savegame_variable()
+    self:set_value(savegame_variable, self:get_num_small_keys() - 1)
   end
 
-  local savegame_variable = self:get_small_keys_savegame_variable()
-  self:set_value(savegame_variable, self:get_num_small_keys() - 1)
-end
-
--- Returns a bottle with the specified content, or nil.
-function game:get_first_bottle_with(variant)
+  -- Returns a bottle with the specified content, or nil.
+  function game:get_first_bottle_with(variant)
 
-  for i = 1, 4 do
-    local item = self:get_item("bottle_" .. i)
-    if item:get_variant() == variant then
-      return item
+    for i = 1, 4 do
+      local item = self:get_item("bottle_" .. i)
+      if item:get_variant() == variant then
+        return item
+      end
     end
-  end
 
-  return nil
-end
+    return nil
+  end
 
-function game:get_first_empty_bottle()
-  return self:get_first_bottle_with(1)
-end
+  function game:get_first_empty_bottle()
+    return self:get_first_bottle_with(1)
+  end
 
-function game:has_bottle()
+  function game:has_bottle()
 
-  for i = 1, 4 do
-    if self:has_item("bottle_" .. i) then
-      return true
+    for i = 1, 4 do
+      if self:has_item("bottle_" .. i) then
+        return true
+      end
     end
+
+    return false
   end
 
-  return false
-end
+  function game:has_bottle_with(variant)
 
-function game:has_bottle_with(variant)
+    return self:get_first_bottle_with(variant) ~= nil
+  end
 
-  return self:get_first_bottle_with(variant) ~= nil
 end
-

zsdx-1.11.0.tar.gz/data/hud/hearts.lua -> zsdx-1.12.0.tar.xz/data/hud/hearts.lua Changed

zsdx-1.11.0.tar.gz/data/hud/hud.lua -> zsdx-1.12.0.tar.xz/data/hud/hud.lua Changed

@@ -1,201 +1,202 @@
-local game = ...
-
-function game:initialize_hud()
-
-  -- Set up the HUD.
-  local hearts_builder = require("hud/hearts")
-  local magic_bar_builder = require("hud/magic_bar")
-  local rupees_builder = require("hud/rupees")
-  local small_keys_builder = require("hud/small_keys")
-  local floor_builder = require("hud/floor")
-  local attack_icon_builder = require("hud/attack_icon")
-  local pause_icon_builder = require("hud/pause_icon")
-  local item_icon_builder = require("hud/item_icon")
-  local action_icon_builder = require("hud/action_icon")
-
-  self.hud = {  -- Array for the hud elements, table for other hud info.
-    showing_dialog = false,
-    top_left_opacity = 255,
-    custom_command_effects = {},
-  }
-
-  local menu = hearts_builder:new(self)
-  menu:set_dst_position(-104, 6)
-  self.hud[#self.hud + 1] = menu
-
-  menu = magic_bar_builder:new(self)
-  menu:set_dst_position(-104, 27)
-  self.hud[#self.hud + 1] = menu
-
-  menu = rupees_builder:new(self)
-  menu:set_dst_position(8, -20)
-  self.hud[#self.hud + 1] = menu
-
-  menu = small_keys_builder:new(self)
-  menu:set_dst_position(-36, -18)
-  self.hud[#self.hud + 1] = menu
-
-  menu = floor_builder:new(self)
-  menu:set_dst_position(5, 70)
-  self.hud[#self.hud + 1] = menu
-
-  menu = pause_icon_builder:new(self)
-  menu:set_dst_position(0, 7)
-  self.hud[#self.hud + 1] = menu
-  self.hud.pause_icon = menu
-
-  menu = item_icon_builder:new(self, 1)
-  menu:set_dst_position(11, 29)
-  self.hud[#self.hud + 1] = menu
-  self.hud.item_icon_1 = menu
-
-  menu = item_icon_builder:new(self, 2)
-  menu:set_dst_position(63, 29)
-  self.hud[#self.hud + 1] = menu
-  self.hud.item_icon_2 = menu
-
-  menu = attack_icon_builder:new(self)
-  menu:set_dst_position(13, 29)
-  self.hud[#self.hud + 1] = menu
-  self.hud.attack_icon = menu
-
-  menu = action_icon_builder:new(self)
-  menu:set_dst_position(26, 51)
-  self.hud[#self.hud + 1] = menu
-  self.hud.action_icon = menu
-
-  self:set_hud_enabled(true)
-
-  self:check_hud()
-end
-
-function game:quit_hud()
+return function(game)
+
+  function game:initialize_hud()
+
+    -- Set up the HUD.
+    local hearts_builder = require("hud/hearts")
+    local magic_bar_builder = require("hud/magic_bar")
+    local rupees_builder = require("hud/rupees")
+    local small_keys_builder = require("hud/small_keys")
+    local floor_builder = require("hud/floor")
+    local attack_icon_builder = require("hud/attack_icon")
+    local pause_icon_builder = require("hud/pause_icon")
+    local item_icon_builder = require("hud/item_icon")
+    local action_icon_builder = require("hud/action_icon")
+
+    self.hud = {  -- Array for the hud elements, table for other hud info.
+      showing_dialog = false,
+      top_left_opacity = 255,
+      custom_command_effects = {},
+    }
+
+    local menu = hearts_builder:new(self)
+    menu:set_dst_position(-104, 6)
+    self.hud[#self.hud + 1] = menu
+
+    menu = magic_bar_builder:new(self)
+    menu:set_dst_position(-104, 27)
+    self.hud[#self.hud + 1] = menu
+
+    menu = rupees_builder:new(self)
+    menu:set_dst_position(8, -20)
+    self.hud[#self.hud + 1] = menu
+
+    menu = small_keys_builder:new(self)
+    menu:set_dst_position(-36, -18)
+    self.hud[#self.hud + 1] = menu
+
+    menu = floor_builder:new(self)
+    menu:set_dst_position(5, 70)
+    self.hud[#self.hud + 1] = menu
+
+    menu = pause_icon_builder:new(self)
+    menu:set_dst_position(0, 7)
+    self.hud[#self.hud + 1] = menu
+    self.hud.pause_icon = menu
+
+    menu = item_icon_builder:new(self, 1)
+    menu:set_dst_position(11, 29)
+    self.hud[#self.hud + 1] = menu
+    self.hud.item_icon_1 = menu
+
+    menu = item_icon_builder:new(self, 2)
+    menu:set_dst_position(63, 29)
+    self.hud[#self.hud + 1] = menu
+    self.hud.item_icon_2 = menu
+
+    menu = attack_icon_builder:new(self)
+    menu:set_dst_position(13, 29)
+    self.hud[#self.hud + 1] = menu
+    self.hud.attack_icon = menu
+
+    menu = action_icon_builder:new(self)
+    menu:set_dst_position(26, 51)
+    self.hud[#self.hud + 1] = menu
+    self.hud.action_icon = menu
+
+    self:set_hud_enabled(true)
 
-  if self:is_hud_enabled() then
-    -- Stop all HUD menus.
-    self:set_hud_enabled(false)
+    self:check_hud()
   end
-  self.hud = nil
-end
 
-function game:check_hud()
-
-  local map = self:get_map()
-  if map ~= nil then
-    -- If the hero is below the top-left icons, make them semi-transparent.
-    local hero = map:get_entity("hero")
-    local hero_x, hero_y = hero:get_position()
-    local camera_x, camera_y = map:get_camera():get_bounding_box()
-    local x = hero_x - camera_x
-    local y = hero_y - camera_y
-    local opacity = nil
-
-    if self.hud.top_left_opacity == 255
-        and not self:is_suspended()
-        and x < 88
-        and y < 80 then
-      opacity = 96
-    elseif self.hud.top_left_opacity == 96
-        and (self:is_suspended()
-        or x >= 88
-        or y >= 80) then
-      opacity = 255
-    end
+  function game:quit_hud()
 
-    if opacity ~= nil then
-      self.hud.top_left_opacity = opacity
-      self.hud.item_icon_1.surface:set_opacity(opacity)
-      self.hud.item_icon_2.surface:set_opacity(opacity)
-      self.hud.pause_icon.surface:set_opacity(opacity)
-      self.hud.attack_icon.surface:set_opacity(opacity)
-      self.hud.action_icon.surface:set_opacity(opacity)
+    if self:is_hud_enabled() then
+      -- Stop all HUD menus.
+      self:set_hud_enabled(false)
     end
+    self.hud = nil
+  end
 
-    -- During a dialog, move the action icon and the sword icon.
-    if not self.hud.showing_dialog and
-        game:is_dialog_enabled() then
-      self.hud.showing_dialog = true
-      self.hud.action_icon:set_dst_position(0, 54)
-      self.hud.attack_icon:set_dst_position(0, 29)
-    elseif self.hud.showing_dialog and
-        not game:is_dialog_enabled() then
-      self.hud.showing_dialog = false
-      self.hud.action_icon:set_dst_position(26, 51)
-      self.hud.attack_icon:set_dst_position(13, 29)
+  function game:check_hud()

zsdx-1.11.0.tar.gz/data/items/bottle.lua -> zsdx-1.12.0.tar.xz/data/items/bottle.lua Changed

@@ -1,100 +1,101 @@
--- This script handles all bottles (each bottle script runs it).
+return function(item)
 
-local item = ...
+  -- This script handles all bottles (each bottle script runs it).
 
-function item:on_using()
+  function item:on_using()
 
-  local variant = self:get_variant()
-  local game = self:get_game()
-  local map = self:get_map()
+    local variant = self:get_variant()
+    local game = self:get_game()
+    local map = self:get_map()
 
-  -- empty bottle
-  if variant == 1 then
-    sol.audio.play_sound("wrong")
-    self:set_finished()
+    -- empty bottle
+    if variant == 1 then
+      sol.audio.play_sound("wrong")
+      self:set_finished()
 
-    -- water
-  elseif variant == 2 then
-    -- ask the hero to pour away the water
-    game:start_dialog("use_bottle_with_water", function(answer)
-      if answer == 1 then
-	-- empty the water
-	self:set_variant(1) -- make the bottle empty
-	sol.audio.play_sound("item_in_water")
-      end
+      -- water
+    elseif variant == 2 then
+      -- ask the hero to pour away the water
+      game:start_dialog("use_bottle_with_water", function(answer)
+        if answer == 1 then
+          -- empty the water
+          self:set_variant(1) -- make the bottle empty
+          sol.audio.play_sound("item_in_water")
+        end
+        self:set_finished()
+      end)
+
+      -- red potion
+    elseif variant == 3 then
+      game:add_life(game:get_max_life())
+      self:set_variant(1)
       self:set_finished()
-    end)
-
-    -- red potion
-  elseif variant == 3 then
-    game:add_life(game:get_max_life())
-    self:set_variant(1)
-    self:set_finished()
-
-    -- green potion
-  elseif variant == 4 then
-    game:add_magic(game:get_max_magic())
-    self:set_variant(1)
-    self:set_finished()
-
-    -- blue potion
-  elseif variant == 5 then
-    game:add_life(game:get_max_life())
-    self:set_variant(1)
-    game:add_magic(game:get_max_magic())
-    self:set_finished()
-
-    -- fairy
-  elseif variant == 6 then
-
-    -- release the fairy
-    local x, y, layer = map:get_entity("hero"):get_position()
-    map:create_pickable{
-      treasure_name = "fairy",
-      treasure_variant = 1,
-      x = x,
-      y = y,
-      layer = layer
-    }
-    self:set_variant(1) -- make the bottle empty
-    self:set_finished()
-  end
-end
 
-function item:on_npc_interaction(npc)
+      -- green potion
+    elseif variant == 4 then
+      game:add_magic(game:get_max_magic())
+      self:set_variant(1)
+      self:set_finished()
 
-  if npc:get_name():find("^water_for_bottle") then
-    local game = self:get_game()
-    local map = self:get_map()
-    -- The hero interacts with a place where he can get some water.
-    if game:has_bottle() then
-      local first_empty_bottle = game:get_first_empty_bottle()
-      if first_empty_bottle ~= nil then
-        game:start_dialog("found_water", function(answer)
-	  if answer == 1 then
-            local hero = map:get_entity("hero")
-            hero:start_treasure(first_empty_bottle:get_name(), 2, nil)
-	  end
-	end)
+      -- blue potion
+    elseif variant == 5 then
+      game:add_life(game:get_max_life())
+      self:set_variant(1)
+      game:add_magic(game:get_max_magic())
+      self:set_finished()
+
+      -- fairy
+    elseif variant == 6 then
+
+      -- release the fairy
+      local x, y, layer = map:get_entity("hero"):get_position()
+      map:create_pickable{
+        treasure_name = "fairy",
+        treasure_variant = 1,
+        x = x,
+        y = y,
+        layer = layer
+      }
+      self:set_variant(1) -- make the bottle empty
+      self:set_finished()
+    end
+  end
+
+  function item:on_npc_interaction(npc)
+
+    if npc:get_name():find("^water_for_bottle") then
+      local game = self:get_game()
+      local map = self:get_map()
+      -- The hero interacts with a place where he can get some water.
+      if game:has_bottle() then
+        local first_empty_bottle = game:get_first_empty_bottle()
+        if first_empty_bottle ~= nil then
+          game:start_dialog("found_water", function(answer)
+            if answer == 1 then
+              local hero = map:get_entity("hero")
+              hero:start_treasure(first_empty_bottle:get_name(), 2, nil)
+            end
+          end)
+        else
+          game:start_dialog("found_water.no_empty_bottle")
+        end
       else
-        game:start_dialog("found_water.no_empty_bottle")
+        game:start_dialog("found_water.no_bottle")
       end
-    else
-      game:start_dialog("found_water.no_bottle")
     end
   end
-end
 
-function item:on_npc_interaction_item(npc, item_used)
+  function item:on_npc_interaction_item(npc, item_used)
 
-  if item_used:get_name():find("^bottle")
-      and npc:get_name():find("^water_for_bottle") then
-    -- the hero interacts with a place where he can get some water:
-    -- no matter whether he pressed the action key or the item key of a bottle, we do the same thing
-    self:on_npc_interaction(npc)
-    return true
-  end
+    if item_used:get_name():find("^bottle")
+        and npc:get_name():find("^water_for_bottle") then
+      -- the hero interacts with a place where he can get some water:
+      -- no matter whether he pressed the action key or the item key of a bottle, we do the same thing
+      self:on_npc_interaction(npc)
+      return true
+    end
 
-  return false
-end
+    return false
+  end
 
+end
\ No newline at end of file

zsdx-1.11.0.tar.gz/data/items/bottle_1.lua -> zsdx-1.12.0.tar.xz/data/items/bottle_1.lua Changed

zsdx-1.11.0.tar.gz/data/items/bottle_2.lua -> zsdx-1.12.0.tar.xz/data/items/bottle_2.lua Changed

zsdx-1.11.0.tar.gz/data/items/bottle_3.lua -> zsdx-1.12.0.tar.xz/data/items/bottle_3.lua Changed

zsdx-1.11.0.tar.gz/data/items/bottle_4.lua -> zsdx-1.12.0.tar.xz/data/items/bottle_4.lua Changed

zsdx-1.11.0.tar.gz/data/languages/fr/text/dialogs.dat -> zsdx-1.12.0.tar.xz/data/languages/fr/text/dialogs.dat Changed

zsdx-1.11.0.tar.gz/data/languages/it/text/dialogs.dat -> zsdx-1.12.0.tar.xz/data/languages/it/text/dialogs.dat Changed

@@ -7,7 +7,7 @@
 Forse con la Chiave
 Grande potresti
 riuscire ad aprirlo!
-]]
+]],
 }
 
 dialog{
@@ -19,7 +19,7 @@
 alla Tana del Mostro!
 Serve la Chiave del
 Mostro per aprirla.
-]]
+]],
 }
 
 dialog{
@@ -29,7 +29,7 @@
 Ti serve qualcosa di
 affilato per tagliare
 queste erbacce.
-]]
+]],
 }
 
 dialog{
@@ -39,7 +39,7 @@
 È ancora troppo pesante
 per riuscire a 
 sollevarlo!
-]]
+]],
 }
 
 dialog{
@@ -51,7 +51,7 @@
 
 Non ce la potrai mai
 fare a mani nude!
-]]
+]],
 }
 
 dialog{
@@ -62,7 +62,7 @@
 cristallo. Prova a 
 colpirlo con 
 qualcosa...
-]]
+]],
 }
 
 dialog{
@@ -70,7 +70,7 @@
   text = [[
 Il forziere è vuoto!
 Che sfortuna!
-]]
+]],
 }
 
 dialog{
@@ -81,7 +81,7 @@
 Mangia delle Mele per
 recuperare la 
 tua Salute.
-]]
+]],
 }
 
 dialog{
@@ -93,7 +93,7 @@
 i nemici e per
 distruggere gli 
 ostacoli.
-]]
+]],
 }
 
 dialog{
@@ -103,7 +103,7 @@
   text = [[
 A che cosa servirà
 questa Chiave d'Osso?
-]]
+]],
 }
 
 dialog{
@@ -115,7 +115,7 @@
 immobilizzare i nemici
 e raccogliere oggetti 
 fuori dalla tua portata.
-]]
+]],
 }
 
 dialog{
@@ -128,7 +128,7 @@
 immobilizzare i nemici
 e raccogliere oggetti
 fuori dalla tua portata.
-]]
+]],
 }
 
 dialog{
@@ -139,7 +139,7 @@
 L'Ampolla Magica può
 contenere varie
 pozioni.
-]]
+]],
 }
 
 dialog{
@@ -151,7 +151,7 @@
 è riempita con acqua.
 Usala nel 
 luogo appropriato...
-]]
+]],
 }
 
 dialog{
@@ -162,7 +162,7 @@
 Bevi la Pozione Rossa
 per riempire tutta
 la Barra della Salute.
-]]
+]],
 }
 
 dialog{
@@ -173,7 +173,7 @@
 Bevi la Pozione Verde
 per riempire tutta
 la Barra del Mana.
-]]
+]],
 }
 
 dialog{
@@ -185,7 +185,7 @@
 per riempire sia
 la Barra della Salute
 che quella del Mana!
-]]
+]],
 }
 
 dialog{
@@ -199,7 +199,7 @@
 Inoltre puoi utilizzarla
 quando vuoi recuperare
 la tua Salute!
-]]
+]],
 }
 
 dialog{
@@ -210,7 +210,7 @@
 Le Ampolle Magiche 
 possono contenere varie
 pozioni.
-]]
+]],
 }
 
 dialog{
@@ -222,7 +222,7 @@
 è riempita con acqua.
 Usala nel
 luogo appropriato...
-]]
+]],
 }
 
 dialog{
@@ -234,7 +234,7 @@
 per riempire
 l'indicatore dei Cuori.
 
-]]
+]],
 }
 
 dialog{
@@ -245,7 +245,7 @@
 Bevi la Pozione Verde
 Per riempire la Barra
 del Mana.
-]]
+]],
 }
 
 dialog{
@@ -257,7 +257,7 @@
 per riempire sia

zsdx-1.11.0.tar.gz/data/main.lua -> zsdx-1.12.0.tar.xz/data/main.lua Changed

@@ -21,6 +21,7 @@
   debug_enabled = sol.file.exists("debug")
 
   local solarus_logo = require("menus/solarus_logo")
+  local team_logo = require("menus/team_logo")
   local language_menu = require("menus/language")
   local title_screen = require("menus/title")
   local savegame_menu = require("menus/savegames")
@@ -28,9 +29,16 @@
   -- Show the Solarus logo first.
   sol.menu.start(self, solarus_logo)
 
-  -- Then the language selection menu, unless a game was started by a debug key.
+  -- Then the Solarus team logo, unless a game was started by a debug key.
   solarus_logo.on_finished = function()
     if self.game == nil then
+      sol.menu.start(self, team_logo)
+    end
+  end
+
+  -- Then the language selection menu.
+  team_logo.on_finished = function()
+    if self.game == nil then
       sol.menu.start(self, language_menu)
     end
   end
@@ -235,7 +243,7 @@
 -- Starts a game.
 function sol.main:start_savegame(game)
 
-  local play_game = sol.main.load_file("play_game")
+  local play_game = require("play_game")
   play_game(game)
 end

zsdx-1.11.0.tar.gz/data/maps/102.lua -> zsdx-1.12.0.tar.xz/data/maps/102.lua Changed

zsdx-1.11.0.tar.gz/data/maps/106.lua -> zsdx-1.12.0.tar.xz/data/maps/106.lua Changed

zsdx-1.11.0.tar.gz/data/maps/108.lua -> zsdx-1.12.0.tar.xz/data/maps/108.lua Changed

zsdx-1.11.0.tar.gz/data/maps/44.lua -> zsdx-1.12.0.tar.xz/data/maps/44.lua Changed

zsdx-1.11.0.tar.gz/data/maps/47.lua -> zsdx-1.12.0.tar.xz/data/maps/47.lua Changed

zsdx-1.11.0.tar.gz/data/maps/59.lua -> zsdx-1.12.0.tar.xz/data/maps/59.lua Changed

zsdx-1.11.0.tar.gz/data/maps/63.lua -> zsdx-1.12.0.tar.xz/data/maps/63.lua Changed

zsdx-1.11.0.tar.gz/data/maps/64.lua -> zsdx-1.12.0.tar.xz/data/maps/64.lua Changed

zsdx-1.11.0.tar.gz/data/maps/65.lua -> zsdx-1.12.0.tar.xz/data/maps/65.lua Changed

zsdx-1.11.0.tar.gz/data/maps/96.lua -> zsdx-1.12.0.tar.xz/data/maps/96.lua Changed

zsdx-1.11.0.tar.gz/data/maps/evil_tiles.lua -> zsdx-1.12.0.tar.xz/data/maps/evil_tiles.lua Changed

@@ -1,59 +1,59 @@
 -- This script enables evil tiles on the map passed as parameter.
+return function(map)
 
-local map = ...
+  -- Starts the attack of evil tiles
+  -- (this function can be called when the hero enters the room of evil tiles).
+  function map:start_evil_tiles()
 
--- Starts the attack of evil tiles
--- (this function can be called when the hero enters the room of evil tiles).
-function map:start_evil_tiles()
+    local total = map:get_entities_count("evil_tile_enemy")
+    local next_index = 1  -- Index of the next evil tile to spawn.
+    local spawn_delay = 1500  -- Delay between two evil tiles.
 
-  local total = map:get_entities_count("evil_tile_enemy")
-  local next_index = 1  -- Index of the next evil tile to spawn.
-  local spawn_delay = 1500  -- Delay between two evil tiles.
+    map:set_entities_enabled("evil_tile_enemy", false)
+    map:set_entities_enabled("evil_tile_after", false)
 
-  map:set_entities_enabled("evil_tile_enemy", false)
-  map:set_entities_enabled("evil_tile_after", false)
+    -- Spawns a tile and schedules the next one.
+    local function repeat_spawn()
 
-  -- Spawns a tile and schedules the next one.
-  local function repeat_spawn()
-
-    map:get_entity("evil_tile_enemy_" .. next_index):set_enabled(true)
-    map:get_entity("evil_tile_after_" .. next_index):set_enabled(true)
-    next_index = next_index + 1
-    if next_index <= total then
-      sol.timer.start(spawn_delay, repeat_spawn)
+      map:get_entity("evil_tile_enemy_" .. next_index):set_enabled(true)
+      map:get_entity("evil_tile_after_" .. next_index):set_enabled(true)
+      next_index = next_index + 1
+      if next_index <= total then
+        sol.timer.start(spawn_delay, repeat_spawn)
+      end
     end
-  end
 
-  -- Plays a sound repeatedly as long as at least one tile is moving.
-  local function repeat_sound()
-
-    sol.audio.play_sound("walk_on_grass")
-
-    -- Repeat the sound until the last tile starts animation "destroy".
-    local again = false
-    local remaining = map:get_entities_count("evil_tile_enemy")
-    if remaining > 1 then
-      again = true
-    elseif remaining == 1 then
-      for enemy in map:get_entities("evil_tile_enemy_") do
-        local sprite = enemy:get_sprite()
-        if sprite and sprite:get_animation() ~= "destroy" then
-          again = true
-          break
+    -- Plays a sound repeatedly as long as at least one tile is moving.
+    local function repeat_sound()
+
+      sol.audio.play_sound("walk_on_grass")
+
+      -- Repeat the sound until the last tile starts animation "destroy".
+      local again = false
+      local remaining = map:get_entities_count("evil_tile_enemy")
+      if remaining > 1 then
+        again = true
+      elseif remaining == 1 then
+        for enemy in map:get_entities("evil_tile_enemy_") do
+          local sprite = enemy:get_sprite()
+          if sprite and sprite:get_animation() ~= "destroy" then
+            again = true
+            break
+          end
         end
       end
-    end
 
-    if again then
-      sol.timer.start(150, repeat_sound)
-    else
-      if map.finish_evil_tiles ~= nil then
-        map:finish_evil_tiles()
+      if again then
+        sol.timer.start(150, repeat_sound)
+      else
+        if map.finish_evil_tiles ~= nil then
+          map:finish_evil_tiles()
+        end
       end
     end
+
+    repeat_spawn()
+    repeat_sound()
   end
 
-  repeat_spawn()
-  repeat_sound()
 end
-

zsdx-1.11.0.tar.gz/data/maps/prison_guard.lua -> zsdx-1.12.0.tar.xz/data/maps/prison_guard.lua Changed

@@ -1,88 +1,89 @@
-local map = ...
 -- This script is included by the maps of dungeon 5.
 -- It handles sending the hero to prison when a guard sees him.
+return function(map)
 
-local hero = map:get_entity("hero")
-local hero_seen = false
-local prison_go_timer = nil
-local prison_dialog_timer = nil
+  local hero = map:get_entity("hero")
+  local hero_seen = false
+  local prison_go_timer = nil
+  local prison_dialog_timer = nil
 
-local function seen_by_guard(guard)
+  local function seen_by_guard(guard)
 
-  hero_seen = true
-  hero:freeze()
-  guard:get_sprite():set_animation("walking")
-  local m = sol.movement.create("target")
-  m:set_speed(96)
-  m:start(guard)
-  sol.audio.play_sound("hero_seen")
-  prison_dialog_timer = sol.timer.start(500, function()
-    if prison_dialog_timer ~= nil then
-      prison_dialog_timer:stop()
-      prison_dialog_timer = nil
-    end
-    if prison_go_timer ~= nil then
-      prison_go_timer:stop()
-      prison_go_timer = nil
-    end
-    map:get_game():start_dialog("dungeon_5.hero_seen_by_guard", function()
-      prison_go_timer = sol.timer.start(1000, function()
-	hero_seen = false
-	if prison_dialog_timer ~= nil then
-	  prison_dialog_timer:stop()
-	  prison_dialog_timer = nil
-	end
-	prison_go_timer = nil
-	hero:teleport(65, "prison")
-	if map.init_prison ~= nil then
-	  -- special case: we are already on the map of the prison
-	  map:init_prison()
-	end
+    hero_seen = true
+    hero:freeze()
+    guard:get_sprite():set_animation("walking")
+    local m = sol.movement.create("target")
+    m:set_speed(96)
+    m:start(guard)
+    sol.audio.play_sound("hero_seen")
+    prison_dialog_timer = sol.timer.start(500, function()
+      if prison_dialog_timer ~= nil then
+        prison_dialog_timer:stop()
+        prison_dialog_timer = nil
+      end
+      if prison_go_timer ~= nil then
+        prison_go_timer:stop()
+        prison_go_timer = nil
+      end
+      map:get_game():start_dialog("dungeon_5.hero_seen_by_guard", function()
+        prison_go_timer = sol.timer.start(1000, function()
+          hero_seen = false
+          if prison_dialog_timer ~= nil then
+            prison_dialog_timer:stop()
+            prison_dialog_timer = nil
+          end
+          prison_go_timer = nil
+          hero:teleport(65, "prison")
+          if map.init_prison ~= nil then
+            -- special case: we are already on the map of the prison
+            map:init_prison()
+          end
+        end)
       end)
     end)
-  end)
-end
+  end
 
-local function guard_sensor_activated(sensor)
+  local function guard_sensor_activated(sensor)
 
-  local guard_num, direction = sensor:get_name():match("guard_([0-9])_sensor_([0-3])")
-  if not hero_seen and guard_num ~= nil then
-    local guard = map:get_entity("guard_" .. guard_num)
-    local sprite = guard:get_sprite()
-    direction = tonumber(direction)
-    if sprite:get_direction() == direction then
+    local guard_num, direction = sensor:get_name():match("guard_([0-9])_sensor_([0-3])")
+    if not hero_seen and guard_num ~= nil then
+      local guard = map:get_entity("guard_" .. guard_num)
+      local sprite = guard:get_sprite()
+      direction = tonumber(direction)
+      if sprite:get_direction() == direction then
 
-      local x, y = guard:get_position()
-      local hero_x, hero_y = hero:get_position()
-      if direction == 0 and hero_x > x - 32 and hero_x < x + 216 then
-        seen_by_guard(guard)
-      elseif direction == 1 and hero_y < y + 32 and hero_y > y - 216 then
-        seen_by_guard(guard)
-      elseif direction == 2 and hero_x < x + 32 and hero_x > x - 216 then
-        seen_by_guard(guard)
-      elseif direction == 3 and hero_y > y - 32 and hero_y < y + 216 then
-        seen_by_guard(guard)
+        local x, y = guard:get_position()
+        local hero_x, hero_y = hero:get_position()
+        if direction == 0 and hero_x > x - 32 and hero_x < x + 216 then
+          seen_by_guard(guard)
+        elseif direction == 1 and hero_y < y + 32 and hero_y > y - 216 then
+          seen_by_guard(guard)
+        elseif direction == 2 and hero_x < x + 32 and hero_x > x - 216 then
+          seen_by_guard(guard)
+        elseif direction == 3 and hero_y > y - 32 and hero_y < y + 216 then
+          seen_by_guard(guard)
+        end
       end
     end
   end
-end
 
-for guard in map:get_entities("guard_") do
-  for sensor in map:get_entities(guard:get_name() .. "_sensor_") do
-    sensor.on_activated = guard_sensor_activated
-    sensor.on_activated_repeat = guard_sensor_activated
+  for guard in map:get_entities("guard_") do
+    for sensor in map:get_entities(guard:get_name() .. "_sensor_") do
+      sensor.on_activated = guard_sensor_activated
+      sensor.on_activated_repeat = guard_sensor_activated
+    end
   end
-end
 
-function map:cancel_prison()
-  if prison_dialog_timer ~= nil then
-    prison_dialog_timer:stop()
-    prison_dialog_timer = nil
-  end
-  if prison_go_timer ~= nil then
-    prison_go_timer:stop()
-    prison_go_timer = nil
+  function map:cancel_prison()
+    if prison_dialog_timer ~= nil then
+      prison_dialog_timer:stop()
+      prison_dialog_timer = nil
+    end
+    if prison_go_timer ~= nil then
+      prison_go_timer:stop()
+      prison_go_timer = nil
+    end
+    hero_seen = false
   end
-  hero_seen = false
-end
 
+end

zsdx-1.11.0.tar.gz/data/menus/dialog_box.lua -> zsdx-1.12.0.tar.xz/data/menus/dialog_box.lua Changed

@@ -1,542 +1,543 @@
-local game = ...
-
-local dialog_box = {
-
-  -- Dialog box properties.
-  dialog = nil,                -- Dialog being displayed or nil.
-  first = true,                -- Whether this is the first dialog of a sequence.
-  style = nil,                 -- "box" or "empty".
-  vertical_position = "auto",  -- "auto", "top" or "bottom".
-  skip_mode = nil,             -- "none", "current", "all" or "unchanged".
-  icon_index = nil,            -- Index of the 16x16 icon in hud/dialog_icons.png or nil.
-  info = nil,                  -- Parameter passed to start_dialog().
-  skipped = false,             -- Whether the player skipped the dialog.
-  selected_answer = nil,       -- Selected answer (1 or 2) or nil if there is no question.
-
-  -- Displaying text gradually.
-  next_line = nil,             -- Next line to display or nil.
-  line_it = nil,               -- Iterator over of all lines of the dialog.
-  lines = {},                  -- Array of the text of the 3 visible lines.
-  line_surfaces = {},          -- Array of the 3 text surfaces.
-  line_index = nil,            -- Line currently being shown.
-  char_index = nil,            -- Next character to show in the current line.
-  char_delay = nil,            -- Delay between two characters in milliseconds.
-  full = false,                -- Whether the 3 visible lines have shown all content.
-  need_letter_sound = false,   -- Whether a sound should be played with the next character.
-  gradual = true,              -- Whether text is displayed gradually.
-
-  -- Graphics.
-  dialog_surface = nil,
-  box_img = nil,
-  icons_img = nil,
-  end_lines_sprite = nil,
-  box_dst_position = nil,      -- Destination coordinates of the dialog box.
-  question_dst_position = nil, -- Destination coordinates of the question icon.
-  icon_dst_position = nil,     -- Destination coordinates of the icon.
-}
-
--- Constants.
-local nb_visible_lines = 3     -- Maximum number of lines in the dialog box.
-local char_delays = {
-  slow = 60,
-  medium = 40,
-  fast = 20  -- Default.
-}
-local letter_sound_delay = 100
-local box_width = 220
-local box_height = 60
-
--- Initializes the dialog box system.
-function game:initialize_dialog_box()
-
-  game.dialog_box = dialog_box
-
-  -- Initialize dialog box data.
-  local font, font_size = sol.language.get_dialog_font()
-  for i = 1, nb_visible_lines do
-    dialog_box.lines[i] = ""
-    dialog_box.line_surfaces[i] = sol.text_surface.create{
-      horizontal_alignment = "left",
-      vertical_alignment = "top",
-      font = font,
-      font_size = font_size,
-    }
+return function(game)
+
+  local dialog_box = {
+
+    -- Dialog box properties.
+    dialog = nil,                -- Dialog being displayed or nil.
+    first = true,                -- Whether this is the first dialog of a sequence.
+    style = nil,                 -- "box" or "empty".
+    vertical_position = "auto",  -- "auto", "top" or "bottom".
+    skip_mode = nil,             -- "none", "current", "all" or "unchanged".
+    icon_index = nil,            -- Index of the 16x16 icon in hud/dialog_icons.png or nil.
+    info = nil,                  -- Parameter passed to start_dialog().
+    skipped = false,             -- Whether the player skipped the dialog.
+    selected_answer = nil,       -- Selected answer (1 or 2) or nil if there is no question.
+
+    -- Displaying text gradually.
+    next_line = nil,             -- Next line to display or nil.
+    line_it = nil,               -- Iterator over of all lines of the dialog.
+    lines = {},                  -- Array of the text of the 3 visible lines.
+    line_surfaces = {},          -- Array of the 3 text surfaces.
+    line_index = nil,            -- Line currently being shown.
+    char_index = nil,            -- Next character to show in the current line.
+    char_delay = nil,            -- Delay between two characters in milliseconds.
+    full = false,                -- Whether the 3 visible lines have shown all content.
+    need_letter_sound = false,   -- Whether a sound should be played with the next character.
+    gradual = true,              -- Whether text is displayed gradually.
+
+    -- Graphics.
+    dialog_surface = nil,
+    box_img = nil,
+    icons_img = nil,
+    end_lines_sprite = nil,
+    box_dst_position = nil,      -- Destination coordinates of the dialog box.
+    question_dst_position = nil, -- Destination coordinates of the question icon.
+    icon_dst_position = nil,     -- Destination coordinates of the icon.
+  }
+
+  -- Constants.
+  local nb_visible_lines = 3     -- Maximum number of lines in the dialog box.
+  local char_delays = {
+    slow = 60,
+    medium = 40,
+    fast = 20  -- Default.
+  }
+  local letter_sound_delay = 100
+  local box_width = 220
+  local box_height = 60
+
+  -- Initializes the dialog box system.
+  function game:initialize_dialog_box()
+
+    game.dialog_box = dialog_box
+
+    -- Initialize dialog box data.
+    local font, font_size = sol.language.get_dialog_font()
+    for i = 1, nb_visible_lines do
+      dialog_box.lines[i] = ""
+      dialog_box.line_surfaces[i] = sol.text_surface.create{
+        horizontal_alignment = "left",
+        vertical_alignment = "top",
+        font = font,
+        font_size = font_size,
+      }
+    end
+    dialog_box.dialog_surface = sol.surface.create(sol.video.get_quest_size())
+    dialog_box.box_img = sol.surface.create("hud/dialog_box.png")
+    dialog_box.icons_img = sol.surface.create("hud/dialog_icons.png")
+    dialog_box.end_lines_sprite = sol.sprite.create("hud/dialog_box_message_end")
+    game:set_dialog_style("box")
   end
-  dialog_box.dialog_surface = sol.surface.create(sol.video.get_quest_size())
-  dialog_box.box_img = sol.surface.create("hud/dialog_box.png")
-  dialog_box.icons_img = sol.surface.create("hud/dialog_icons.png")
-  dialog_box.end_lines_sprite = sol.sprite.create("hud/dialog_box_message_end")
-  game:set_dialog_style("box")
-end
 
--- Exits the dialog box system.
-function game:quit_dialog_box()
+  -- Exits the dialog box system.
+  function game:quit_dialog_box()
 
-  if dialog_box ~= nil then
-    if game:is_dialog_enabled() then
-      sol.menu.stop(dialog_box)
+    if dialog_box ~= nil then
+      if game:is_dialog_enabled() then
+        sol.menu.stop(dialog_box)
+      end
+      game.dialog_box = nil
     end
-    game.dialog_box = nil
   end
-end
 
--- Called by the engine when a dialog starts.
-function game:on_dialog_started(dialog, info)
+  -- Called by the engine when a dialog starts.
+  function game:on_dialog_started(dialog, info)
 
-  dialog_box.dialog = dialog
-  dialog_box.info = info
-  sol.menu.start(game, dialog_box)
-end
+    dialog_box.dialog = dialog
+    dialog_box.info = info
+    sol.menu.start(game, dialog_box)
+  end
 
--- Called by the engine when a dialog finishes.
-function game:on_dialog_finished(dialog)
+  -- Called by the engine when a dialog finishes.
+  function game:on_dialog_finished(dialog)
 
-  sol.menu.stop(dialog_box)
-  dialog_box.dialog = nil
-  dialog_box.info = nil
-end
+    sol.menu.stop(dialog_box)
+    dialog_box.dialog = nil
+    dialog_box.info = nil
+  end
 
--- Sets the style of the dialog box for subsequent dialogs.
--- style must be one of:
--- - "box" (default): Usual dialog box.
--- - "empty": No decoration.
-function game:set_dialog_style(style)
+  -- Sets the style of the dialog box for subsequent dialogs.
+  -- style must be one of:
+  -- - "box" (default): Usual dialog box.
+  -- - "empty": No decoration.
+  function game:set_dialog_style(style)
 
-  dialog_box.style = style
-  if style == "box" then

zsdx-1.11.0.tar.gz/data/menus/game_over.lua -> zsdx-1.12.0.tar.xz/data/menus/game_over.lua Changed

@@ -1,194 +1,195 @@
-local game = ...
-
-local game_over_menu = {}  -- The game-over menu.
-
-local music
-local background_img
-local hero_was_visible
-local hero_dead_sprite
-local hero_dead_x, hero_dead_y
-local fade_sprite
-local fairy_sprite
-local cursor_position
-local state
-
--- state can be one of:
--- "waiting_start": The game-over scene will start soon.
--- "closing_game": Fade-out on the game screen.
--- "red_screen": Red screen during a small delay.
--- "opening_menu": Fade-in on the game-over menu.
--- "saved_by_fairy": The player is being saved by a fairy.
--- "waiting_end": The game will be resumed soon.
--- "resume_game": The game can be resumed.
--- "menu": The player can choose an option in the game-over menu.
--- "finished": An action was validated in the menu.
-
-function game:on_game_over_started()
-
-  -- Attach the game-over menu to the map so that the map's fade-out
-  -- effect applies to it when restarting the game.
-  sol.menu.start(game:get_map(), game_over_menu)
-end
+return function(game)
+
+  local game_over_menu = {}  -- The game-over menu.
+
+  local music
+  local background_img
+  local hero_was_visible
+  local hero_dead_sprite
+  local hero_dead_x, hero_dead_y
+  local fade_sprite
+  local fairy_sprite
+  local cursor_position
+  local state
+
+  -- state can be one of:
+  -- "waiting_start": The game-over scene will start soon.
+  -- "closing_game": Fade-out on the game screen.
+  -- "red_screen": Red screen during a small delay.
+  -- "opening_menu": Fade-in on the game-over menu.
+  -- "saved_by_fairy": The player is being saved by a fairy.
+  -- "waiting_end": The game will be resumed soon.
+  -- "resume_game": The game can be resumed.
+  -- "menu": The player can choose an option in the game-over menu.
+  -- "finished": An action was validated in the menu.
+
+  function game:on_game_over_started()
+
+    -- Attach the game-over menu to the map so that the map's fade-out
+    -- effect applies to it when restarting the game.
+    sol.menu.start(game:get_map(), game_over_menu)
+  end
 
-function game_over_menu:on_started()
-
-  local hero = game:get_hero()
-  hero_was_visible = hero:is_visible()
-  hero:set_visible(false)
-  music = sol.audio.get_music()
-  background_img = sol.surface.create("gameover_menu.png", true)
-  local tunic = game:get_ability("tunic")
-  hero_dead_sprite = sol.sprite.create("hero/tunic" .. tunic)
-  hero_dead_sprite:set_animation("hurt")
-  hero_dead_sprite:set_direction(hero:get_direction())
-  hero_dead_sprite:set_paused(true)
-  fade_sprite = sol.sprite.create("hud/gameover_fade")
-  fairy_sprite = sol.sprite.create("entities/items")
-  fairy_sprite:set_animation("fairy")
-  state = "waiting_start"
-
-  local map = game:get_map()
-  local camera_x, camera_y = map:get_camera():get_bounding_box()
-  local hero_x, hero_y = hero:get_position()
-  hero_dead_x = hero_x - camera_x
-  hero_dead_y = hero_y - camera_y
-
-  sol.timer.start(self, 500, function()
-    state = "closing_game"
-    sol.audio.stop_music()
-    fade_sprite:set_animation("close")
-    fade_sprite.on_animation_finished = function()
-      if state == "closing_game" then
-        state = "red_screen"
-        sol.audio.play_sound("hero_dying")
-        hero_dead_sprite:set_paused(false)
-        hero_dead_sprite:set_direction(0)
-        hero_dead_sprite:set_animation("dying")
-        sol.timer.start(self, 2000, function()
-          state = "opening_menu"
-          fade_sprite:set_animation("open")
-        end)
-      elseif state == "opening_menu" then
-        local bottle_with_fairy = game:get_first_bottle_with(6)
-        if bottle_with_fairy ~= nil then
-          -- Has a fairy.
-          state = "saved_by_fairy"
-
-          -- Make the bottle empty.
-          bottle_with_fairy:set_variant(1)
-          fairy_sprite:set_xy(hero_dead_x + 12, hero_dead_y + 21)
-          local movement = sol.movement.create("target")
-          movement:set_target(240, 22)
-          movement:set_speed(96)
-
-          movement:start(fairy_sprite, function()
-            state = "waiting_end"
-            game:add_life(7 * 4)  -- Restore 7 hearts.
-            sol.timer.start(self, 1000, function()
-              state = "resume_game"
-              sol.audio.play_music(music)
-              game:stop_game_over()
-              sol.menu.stop(self)
-            end)
+  function game_over_menu:on_started()
+
+    local hero = game:get_hero()
+    hero_was_visible = hero:is_visible()
+    hero:set_visible(false)
+    music = sol.audio.get_music()
+    background_img = sol.surface.create("gameover_menu.png", true)
+    local tunic = game:get_ability("tunic")
+    hero_dead_sprite = sol.sprite.create("hero/tunic" .. tunic)
+    hero_dead_sprite:set_animation("hurt")
+    hero_dead_sprite:set_direction(hero:get_direction())
+    hero_dead_sprite:set_paused(true)
+    fade_sprite = sol.sprite.create("hud/gameover_fade")
+    fairy_sprite = sol.sprite.create("entities/items")
+    fairy_sprite:set_animation("fairy")
+    state = "waiting_start"
+
+    local map = game:get_map()
+    local camera_x, camera_y = map:get_camera():get_bounding_box()
+    local hero_x, hero_y = hero:get_position()
+    hero_dead_x = hero_x - camera_x
+    hero_dead_y = hero_y - camera_y
+
+    sol.timer.start(self, 500, function()
+      state = "closing_game"
+      sol.audio.stop_music()
+      fade_sprite:set_animation("close")
+      fade_sprite.on_animation_finished = function()
+        if state == "closing_game" then
+          state = "red_screen"
+          sol.audio.play_sound("hero_dying")
+          hero_dead_sprite:set_paused(false)
+          hero_dead_sprite:set_direction(0)
+          hero_dead_sprite:set_animation("dying")
+          sol.timer.start(self, 2000, function()
+            state = "opening_menu"
+            fade_sprite:set_animation("open")
           end)
-        else
-          -- No fairy: game over.
-          state = "menu"
-          sol.audio.play_music("game_over")
-          fairy_sprite:set_xy(76, 112)  -- Cursor.
-          cursor_position = 0
-        end
+        elseif state == "opening_menu" then
+          local bottle_with_fairy = game:get_first_bottle_with(6)
+          if bottle_with_fairy ~= nil then
+            -- Has a fairy.
+            state = "saved_by_fairy"
+
+            -- Make the bottle empty.
+            bottle_with_fairy:set_variant(1)
+            fairy_sprite:set_xy(hero_dead_x + 12, hero_dead_y + 21)
+            local movement = sol.movement.create("target")
+            movement:set_target(240, 22)
+            movement:set_speed(96)
+
+            movement:start(fairy_sprite, function()
+              state = "waiting_end"
+              game:add_life(7 * 4)  -- Restore 7 hearts.
+              sol.timer.start(self, 1000, function()
+                state = "resume_game"
+                sol.audio.play_music(music)
+                game:stop_game_over()
+                sol.menu.stop(self)
+              end)
+            end)
+          else
+            -- No fairy: game over.
+            state = "menu"
+            sol.audio.play_music("game_over")
+            fairy_sprite:set_xy(76, 112)  -- Cursor.
+            cursor_position = 0
+          end

zsdx-1.11.0.tar.gz/data/menus/language.lua -> zsdx-1.12.0.tar.xz/data/menus/language.lua Changed

@@ -2,6 +2,7 @@
 -- If a language is already set, we skip this menu.
 
 local language_menu = {}
+local last_joy_axis_move = { 0, 0 }
 
 function language_menu:on_started()
 
@@ -106,19 +107,27 @@
 
 function language_menu:on_joypad_axis_moved(axis, state)
 
-  if axis % 2 == 0 then  -- Horizontal axis.
-    if state > 0 then
-      self:direction_pressed(0)
-    elseif state < 0 then
-      self:direction_pressed(4)
-    end
-  else  -- Vertical axis.
-    if state > 0 then
-      self:direction_pressed(6)
-    elseif state < 0 then
-      self:direction_pressed(2)
+  -- Avoid move repetition
+  local handled = last_joy_axis_move[axis % 2] == state
+  last_joy_axis_move[axis % 2] = state
+
+  if not handled then
+    if axis % 2 == 0 then  -- Horizontal axis.
+      if state > 0 then
+        self:direction_pressed(0)
+      elseif state < 0 then
+        self:direction_pressed(4)
+      end
+    else  -- Vertical axis.
+      if state > 0 then
+        self:direction_pressed(6)
+      elseif state < 0 then
+        self:direction_pressed(2)
+      end
     end
   end
+
+  return handled
 end
 
 function language_menu:on_joypad_hat_moved(hat, direction8)

zsdx-1.11.0.tar.gz/data/menus/pause.lua -> zsdx-1.12.0.tar.xz/data/menus/pause.lua Changed

@@ -1,37 +1,48 @@
-local game = ...
-
-local inventory_builder = require("menus/pause_inventory")
-local map_builder = require("menus/pause_map")
-local quest_status_builder = require("menus/pause_quest_status")
-local options_builder = require("menus/pause_options")
-
-function game:start_pause_menu()
-
-  self.pause_submenus = {
-    inventory_builder:new(self),
-    map_builder:new(self),
-    quest_status_builder:new(self),
-    options_builder:new(self),
-  }
-
-  local submenu_index = self:get_value("pause_last_submenu") or 1
-  if submenu_index <= 0
-      or submenu_index > #self.pause_submenus then
-    submenu_index = 1
+return function(game)
+
+  local inventory_builder = require("menus/pause_inventory")
+  local map_builder = require("menus/pause_map")
+  local quest_status_builder = require("menus/pause_quest_status")
+  local options_builder = require("menus/pause_options")
+  local last_joy_axis_move = { 0, 0 }
+
+  function game:start_pause_menu()
+
+    self.pause_submenus = {
+      inventory_builder:new(self),
+      map_builder:new(self),
+      quest_status_builder:new(self),
+      options_builder:new(self),
+    }
+
+    local submenu_index = self:get_value("pause_last_submenu") or 1
+    if submenu_index <= 0
+        or submenu_index > #self.pause_submenus then
+      submenu_index = 1
+    end
+    self:set_value("pause_last_submenu", submenu_index)
+
+    sol.audio.play_sound("pause_open")
+    sol.menu.start(self, self.pause_submenus[submenu_index], false)
   end
-  self:set_value("pause_last_submenu", submenu_index)
 
-  sol.audio.play_sound("pause_open")
-  sol.menu.start(self, self.pause_submenus[submenu_index], false)
-end
+  function game:stop_pause_menu()
+
+    sol.audio.play_sound("pause_closed")
+    local submenu_index = self:get_value("pause_last_submenu")
+    sol.menu.stop(self.pause_submenus[submenu_index])
+    self.pause_submenus = {}
+    self:set_custom_command_effect("action", nil)
+    self:set_custom_command_effect("attack", nil)
+  end
 
-function game:stop_pause_menu()
+  function game:on_joypad_axis_moved(axis, state)
 
-  sol.audio.play_sound("pause_closed")
-  local submenu_index = self:get_value("pause_last_submenu")
-  sol.menu.stop(self.pause_submenus[submenu_index])
-  self.pause_submenus = {}
-  self:set_custom_command_effect("action", nil)
-  self:set_custom_command_effect("attack", nil)
-end
+    -- Avoid move repetition
+    local handled = last_joy_axis_move[axis % 2] == state
+    last_joy_axis_move[axis % 2] = state
 
+    return handled
+  end
+
+end

zsdx-1.11.0.tar.gz/data/menus/pause_inventory.lua -> zsdx-1.12.0.tar.xz/data/menus/pause_inventory.lua Changed

zsdx-1.11.0.tar.gz/data/menus/pause_map.lua -> zsdx-1.12.0.tar.xz/data/menus/pause_map.lua Changed

@@ -304,7 +304,7 @@
   dst_y = old_dst_y + (self.highest_floor_displayed - self.selected_floor) * 12
   self.dungeon_floors_img:draw_region(src_x, src_y, src_width, src_height,
       dst_surface, dst_x, dst_y)
- 
+
   -- Draw the hero's icon if any.
   local lowest_floor_displayed = self.highest_floor_displayed - self.nb_floors_displayed + 1
   if self.hero_floor ~= nil
@@ -392,7 +392,7 @@
         and boss.savegame_variable ~= nil
         and not self.game:get_value(boss.savegame_variable) then
       -- Boss coordinates are already relative to its floor.
-      local dst_x, dst_y = self:to_dungeon_minimap_coordinates(boss.x, boss.y) 
+      local dst_x, dst_y = self:to_dungeon_minimap_coordinates(boss.x, boss.y)
       dst_x = dst_x - 4
       dst_y = dst_y - 4
       self.dungeon_map_icons_img:draw_region(78, 0, 8, 8,
@@ -445,7 +445,7 @@
       current_map_y = map_properties.y
     end,
 
-    chest = function(chest_properties) 
+    chest = function(chest_properties)
       -- Get the info about this chest and store it into the dungeon table.
       if current_floor ~= nil then
         dungeon.chests[#dungeon.chests + 1] = {

zsdx-1.11.0.tar.gz/data/menus/pause_options.lua -> zsdx-1.12.0.tar.xz/data/menus/pause_options.lua Changed

zsdx-1.11.0.tar.gz/data/menus/savegames.lua -> zsdx-1.12.0.tar.xz/data/menus/savegames.lua Changed

@@ -2,6 +2,7 @@
 
 local savegame_menu = {}
 local cloud_width, cloud_height = 111, 88
+local last_joy_axis_move = { 0, 0 }
 
 function savegame_menu:on_started()
 
@@ -104,19 +105,27 @@
 
 function savegame_menu:on_joypad_axis_moved(axis, state)
 
-  if axis % 2 == 0 then  -- Horizontal axis.
-    if state > 0 then
-      self:direction_pressed(0)
-    elseif state < 0 then
-      self:direction_pressed(4)
-    end
-  else  -- Vertical axis.
-    if state > 0 then
-      self:direction_pressed(6)
-    elseif state < 0 then
-      self:direction_pressed(2)
+  -- Avoid move repetition
+  local handled = last_joy_axis_move[axis % 2] == state
+  last_joy_axis_move[axis % 2] = state
+
+  if not handled then
+    if axis % 2 == 0 then  -- Horizontal axis.
+      if state > 0 then
+        self:direction_pressed(0)
+      elseif state < 0 then
+        self:direction_pressed(4)
+      end
+    else  -- Vertical axis.
+      if state > 0 then
+        self:direction_pressed(6)
+      elseif state < 0 then
+        self:direction_pressed(2)
+      end
     end
   end
+
+  return handled
 end
 
 function savegame_menu:on_joypad_hat_moved(hat, direction8)
@@ -265,7 +274,6 @@
       -- Hearts.
       local hearts_class = require("hud/hearts")
       slot.hearts_view = hearts_class:new(slot.savegame)
-      slot.hearts_view:on_started()
     else
       -- New file.
       local name = "- " .. sol.language.get_string("selection_menu.empty") .. " -"

zsdx-1.11.0.tar.gz/data/menus/solarus_logo.lua -> zsdx-1.12.0.tar.xz/data/menus/solarus_logo.lua Changed

zsdx-1.12.0.tar.xz/data/menus/team_logo.lua Added

@@ -0,0 +1,227 @@
+-- Animated Solarus Team logo
+
+-- Usage:
+-- local team_logo = require("menus/team_logo")
+-- sol.menu.start(team_logo)
+
+-----------------------------------------------------------------
+
+local team_logo_menu = {}
+
+-- Load Solarus Team logo sprite and text.
+local logo_sprite = sol.sprite.create("menus/team_logo")
+local logo_sprite_width, logo_sprite_height = logo_sprite:get_size()
+
+local text_img = sol.surface.create("menus/team_logo_text.png")
+local txt_width, txt_height = text_img:get_size()
+
+-- Compute each item position.
+local vertical_margin = 13
+local full_logo_width = math.max(logo_sprite_width, txt_width)
+local full_logo_height = logo_sprite_height + vertical_margin + txt_height
+
+local logo_sprite_x = (full_logo_width - logo_sprite_width) / 2
+local logo_sprite_y = 0
+logo_sprite:set_xy(logo_sprite_x, logo_sprite_y)
+
+local text_x =  (full_logo_width - txt_width) / 2
+local text_y = full_logo_height - txt_height
+text_img:set_xy(text_x, text_y)
+
+-- Counter for the number of 1/2 rotations.
+local rotation_count = 0
+local max_rotation_count = 7
+logo_sprite:set_animation("rotation")
+local rotation_frame_count = logo_sprite:get_num_frames()
+rotation_frame_count = rotation_frame_count / 2
+logo_sprite:set_animation("static")
+
+-- Handling sprite delay.
+local sprite_initial_delay = 5
+local sprite_final_delay = 50
+local sprite_delay_diff = sprite_final_delay - sprite_initial_delay
+
+-- Animation steps.
+local NO_STATE, ROTATING, SHINING, FINAL = 0, 1, 2, 3
+local animation_step = NO_STATE
+
+-----------------------------------------------------------------
+
+-- Quadratic easing in function:
+-- t = elapsed time
+-- b = begin
+-- c = change == ending - beginning
+-- d = duration (total time)
+local function get_easing_value(t, b, c, d)
+  t = t / d
+  return c * math.pow(t, 2) + b
+end
+
+-----------------------------------------------------------------
+
+-- Count the number of 1/2 rotations, and each time decelerate a bit.
+function logo_sprite:on_frame_changed(animation, frame)
+
+  if not sol.menu.is_started(team_logo_menu) then
+    return
+  end
+
+  if animation_step == 0 then
+    return
+  end
+
+  if animation == "rotation" and (frame % rotation_frame_count) == 0 then
+    local current_time = rotation_count / (max_rotation_count - 1)
+
+    -- Decrement the speed.
+    local new_delay = get_easing_value(current_time, sprite_initial_delay, sprite_delay_diff, 1)
+    logo_sprite:set_frame_delay(new_delay)
+
+    -- Increment the count.
+    rotation_count = rotation_count + 1
+
+    -- Stop when max_rotation_count is reach.
+    if rotation_count == max_rotation_count then
+      logo_sprite:set_paused(true)
+      -- Wait a bit before shining
+      sol.timer.start(team_logo_menu, 400, function()
+        if animation_step < SHINING then
+          team_logo_menu:go_to_step(SHINING)
+        end
+      end)
+    end
+  end
+end
+
+-- Automatically go to the next step.
+function logo_sprite:on_animation_finished(animation)
+
+  if not sol.menu.is_started(team_logo_menu) then
+    return
+  end
+
+  if animation == "rotation" then
+    team_logo_menu:go_to_step(SHINING)
+  elseif animation == "shine" then
+    team_logo_menu:go_to_step(FINAL)
+  end
+end
+
+----------------------------------------------------------------
+
+-- Launch the animation.
+function team_logo_menu:start_animation()
+  -- First, reset everything.
+  team_logo_menu:go_to_step(NO_STATE)
+  -- Start step 1.
+  team_logo_menu:go_to_step(ROTATING)
+end
+
+-- Define the current step of the animation.
+function team_logo_menu:go_to_step(step)
+  -- Step 1: rotate the logo on itself.
+  if step == ROTATING then
+    animation_step = step
+    rotation_count = 0
+    logo_sprite:fade_in(5)
+    logo_sprite:set_animation("rotation")
+    logo_sprite:set_direction(0)
+    logo_sprite:set_frame_delay(sprite_initial_delay)
+    logo_sprite:set_frame(7)
+
+  -- Step 2: shine on the logo.
+  elseif step == SHINING then
+    animation_step = step
+    rotation_count = 0
+    logo_sprite:set_animation("shine")
+    logo_sprite:set_direction(0)
+    sol.audio.play_sound("zonzifleur/solarus_team_logo")
+
+  -- Step 3: everything is displayed, no more animation.
+  elseif step == FINAL then
+    animation_step = step
+    rotation_count = 0
+    logo_sprite:set_animation("static")
+    logo_sprite:set_direction(0)
+
+    -- Start the final timer.
+    sol.timer.start(team_logo_menu, 700, function()
+      -- Fade-out both the logo and the text.
+      logo_sprite:fade_out()
+      text_img:fade_out()
+      -- Start another timer to quit the menu.
+      sol.timer.start(team_logo_menu, 900, function()
+        sol.menu.stop(team_logo_menu)
+      end)
+    end)
+
+  -- Reset the animation in default state.
+  else
+    animation_step = NO_STATE
+    rotation_count = 0
+    logo_sprite:set_animation("static")
+    logo_sprite:set_direction(0)
+  end
+end
+
+-----------------------------------------------------------------
+
+function team_logo_menu:on_started()
+  -- Start the animation.
+  team_logo_menu:start_animation()
+end
+
+-- Draws this menu on the quest screen.
+function team_logo_menu:on_draw(screen)
+  -- Get logo coordinates in the screen.
+  local screen_width, screen_height = screen:get_size()
+  local full_logo_x = (screen_width - full_logo_width) / 2
+  local full_logo_y = (screen_height - full_logo_height) / 2
+
+  -- Draw logo sprite.
+  logo_sprite:draw(screen, full_logo_x, full_logo_y)
+
+  -- Draw the text (only after step 1 is done).
+  if animation_step >= SHINING then
+    text_img:draw(screen, full_logo_x, full_logo_y)
+  end
+end
+
+-- Key pressed: skip menu or quit Solarus.
+function team_logo_menu:on_key_pressed(key)
+  if key == "return" or key == "space" then
+    return team_logo_menu:try_skip_menu()
+  elseif key == "escape" then
+    sol.main.exit()
+    return true
+  end
+end
+

zsdx-1.11.0.tar.gz/data/play_game.lua -> zsdx-1.12.0.tar.xz/data/play_game.lua Changed

@@ -1,99 +1,100 @@
-local game = ...
+return function(game)
 
--- Include the various game features.
-sol.main.load_file("dungeons")(game)
-sol.main.load_file("equipment")(game)
-sol.main.load_file("menus/pause")(game)
-sol.main.load_file("menus/dialog_box")(game)
-sol.main.load_file("menus/game_over")(game)
-sol.main.load_file("hud/hud")(game)
+  -- Include the various game features.
+  require("dungeons")(game)
+  require("equipment")(game)
+  require("menus/pause")(game)
+  require("menus/dialog_box")(game)
+  require("menus/game_over")(game)
+  require("hud/hud")(game)
 
--- Useful functions for this specific quest.
+  -- Useful functions for this specific quest.
 
-function game:on_started()
+  function game:on_started()
 
-  -- Set up the dialog box and the HUD.
-  self:initialize_dialog_box()
-  self:initialize_hud()
-end
+    -- Set up the dialog box and the HUD.
+    self:initialize_dialog_box()
+    self:initialize_hud()
+  end
 
-function game:on_finished()
+  function game:on_finished()
 
-  -- Clean what was created by on_started().
-  self:quit_hud()
-  self:quit_dialog_box()
-end
+    -- Clean what was created by on_started().
+    self:quit_hud()
+    self:quit_dialog_box()
+  end
 
--- This event is called when a new map has just become active.
-function game:on_map_changed(map)
+  -- This event is called when a new map has just become active.
+  function game:on_map_changed(map)
 
-  -- Notify the hud.
-  self:hud_on_map_changed(map)
-end
+    -- Notify the hud.
+    self:hud_on_map_changed(map)
+  end
 
-function game:on_paused()
-  self:hud_on_paused()
-  self:start_pause_menu()
-end
+  function game:on_paused()
+    self:hud_on_paused()
+    self:start_pause_menu()
+  end
 
-function game:on_unpaused()
-  self:stop_pause_menu()
-  self:hud_on_unpaused()
-end
+  function game:on_unpaused()
+    self:stop_pause_menu()
+    self:hud_on_unpaused()
+  end
 
-function game:get_player_name()
-  return self:get_value("player_name")
-end
+  function game:get_player_name()
+    return self:get_value("player_name")
+  end
 
-function game:set_player_name(player_name)
-  self:set_value("player_name", player_name)
-end
+  function game:set_player_name(player_name)
+    self:set_value("player_name", player_name)
+  end
 
--- Returns whether the current map is in the inside world.
-function game:is_in_inside_world()
-  return self:get_map():get_world() == "inside_world"
-end
+  -- Returns whether the current map is in the inside world.
+  function game:is_in_inside_world()
+    return self:get_map():get_world() == "inside_world"
+  end
 
--- Returns whether the current map is in the outside world.
-function game:is_in_outside_world()
-  return self:get_map():get_world() == "outside_world"
-end
+  -- Returns whether the current map is in the outside world.
+  function game:is_in_outside_world()
+    return self:get_map():get_world() == "outside_world"
+  end
 
--- Returns whether the current map is in a dungeon.
-function game:is_in_dungeon()
-  return self:get_dungeon() ~= nil
-end
+  -- Returns whether the current map is in a dungeon.
+  function game:is_in_dungeon()
+    return self:get_dungeon() ~= nil
+  end
 
--- Checks the initial position and fixes it if necessary.
-local function fix_starting_location(game)
-
-  -- Check if the savegame was broken by the bug of the teletransportation
-  -- in Billy's cave. If yes, fix it.
-  local initial_map_id = game:get_starting_location()
-  if initial_map_id == "121"  -- Billy's cave North.
-      or initial_map_id == "53" then  -- Dungeon 8 hidden room.
-
-    -- It is supposed to be impossible to start a game here before dungeon 8.
-    if not game:get_value("b703") then  -- Locked door in dungeon 8 1F.
-      -- The locked door is not open yet: the savegame has the bug.
-      -- Fix the starting location and close Billy's door again.
-      game:set_starting_location("5", "from_billy_cave")
-      game:set_value("b928", false)  -- Close the door.
-    end
+  -- Checks the initial position and fixes it if necessary.
+  local function fix_starting_location(game)
 
+    -- Check if the savegame was broken by the bug of the teletransportation
+    -- in Billy's cave. If yes, fix it.
+    local initial_map_id = game:get_starting_location()
+    if initial_map_id == "121"  -- Billy's cave North.
+        or initial_map_id == "53" then  -- Dungeon 8 hidden room.
+
+      -- It is supposed to be impossible to start a game here before dungeon 8.
+      if not game:get_value("b703") then  -- Locked door in dungeon 8 1F.
+        -- The locked door is not open yet: the savegame has the bug.
+        -- Fix the starting location and close Billy's door again.
+        game:set_starting_location("5", "from_billy_cave")
+        game:set_value("b928", false)  -- Close the door.
+      end
+
+    end
   end
-end
 
--- Allows the hero to jump over water when he cannot swim.
--- This was the default behavior before Solarus 1.5.
-local function fix_jump_over_water(game)
+  -- Allows the hero to jump over water when he cannot swim.
+  -- This was the default behavior before Solarus 1.5.
+  local function fix_jump_over_water(game)
 
-  game:set_ability("jump_over_water", 1)
-end
+    game:set_ability("jump_over_water", 1)
+  end
 
--- Run the game.
-sol.main.game = game
-fix_starting_location(game)
-fix_jump_over_water(game)
-game:start()
+  -- Run the game.
+  sol.main.game = game
+  fix_starting_location(game)
+  fix_jump_over_water(game)
+  game:start()
 
+end

zsdx-1.11.0.tar.gz/data/project_db.dat -> zsdx-1.12.0.tar.xz/data/project_db.dat Changed

@@ -322,6 +322,7 @@
 sprite{ id = "menus/pause_save_dialog", description = "Menu: Pause save dialog" }
 sprite{ id = "menus/selection_menu_cursor", description = "Menu: Savegame cursor" }
 sprite{ id = "menus/solarus_logo", description = "Menu: Solarus logo" }
+sprite{ id = "menus/team_logo", description = "Solarus Team logo" }
 sprite{ id = "npc/agahnim", description = "Agahnim" }
 sprite{ id = "npc/billy", description = "Billy" }
 sprite{ id = "npc/black_knight_soldier", description = "Black Knight Soldier" }
@@ -418,6 +419,7 @@
 sound{ id = "chest_open", description = "chest_open" }
 sound{ id = "cursor", description = "cursor" }
 sound{ id = "danger", description = "danger" }
+sound{ id = "diarandor/solarus_logo", description = "Solarus logo" }
 sound{ id = "door_closed", description = "door_closed" }
 sound{ id = "door_open", description = "door_open" }
 sound{ id = "door_unlocked", description = "door_unlocked" }
@@ -463,7 +465,6 @@
 sound{ id = "rupee_counter_end", description = "rupee_counter_end" }
 sound{ id = "secret", description = "secret" }
 sound{ id = "shield", description = "shield" }
-sound{ id = "solarus_logo", description = "Solarus logo" }
 sound{ id = "splash", description = "splash" }
 sound{ id = "stairs_down_end", description = "stairs_down_end" }
 sound{ id = "stairs_down_start", description = "stairs_down_start" }
@@ -494,6 +495,7 @@
 sound{ id = "water_fill_begin", description = "water_fill_begin" }
 sound{ id = "world_warp", description = "world_warp" }
 sound{ id = "wrong", description = "wrong" }
+sound{ id = "zonzifleur/solarus_team_logo", description = "Solarus Team logo" }
 sound{ id = "zora", description = "zora" }
 
 item{ id = "apple", description = "Apples (x3)" }
@@ -635,3 +637,1176 @@
 font{ id = "white_digits", description = "white_digits" }
 font{ id = "wqy-zenhei", description = "wqy-zenhei" }
 
+
+file{ path = "console.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "dungeons.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "enemies", author = "Christopho", license = "GPL v3" }
+file{ path = "enemies/agahnim.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "enemies/agahnim_2.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "enemies/agahnim_2_fake.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "enemies/arbror_root.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "enemies/bee_guard.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "enemies/billy.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "enemies/blue_bullblin.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "enemies/blue_dogman.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "enemies/blue_duck_soldier.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "enemies/blue_fireball_triple.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "enemies/blue_flame.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "enemies/blue_hardhat_beetle.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "enemies/blue_knight_soldier.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "enemies/blue_pig_soldier.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "enemies/bubble.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "enemies/chain_and_ball.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "enemies/drakomos.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "enemies/drakomos_head.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "enemies/drakomos_lava_spawner.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "enemies/evil_tile.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "enemies/fire_bat.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "enemies/fire_circle.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "enemies/fireball_simple.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "enemies/firebird.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "enemies/flora_gohma.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "enemies/flora_gohma_eye.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "enemies/ganon.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "enemies/gelidrak.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "enemies/gelidrak_head.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "enemies/gelidrak_tail.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "enemies/generic_soldier.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "enemies/generic_towards_hero.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "enemies/generic_waiting_for_hero.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "enemies/gibdo.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "enemies/globul.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "enemies/green_duck_soldier.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "enemies/green_knight_soldier.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "enemies/khorneth.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "enemies/khotor.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "enemies/laser.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "enemies/lizalfos.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "enemies/mandible.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "enemies/master_arbror.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "enemies/mini_mowatulla.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "enemies/minillosaur_egg_fixed.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "enemies/minillosaur_egg_thrown.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "enemies/mowatulla.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "enemies/papillosaur_king.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "enemies/pike_auto.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "enemies/pike_detect.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "enemies/pike_fixed.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "enemies/poutroxor.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "enemies/red_bullblin.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "enemies/red_dogman.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "enemies/red_duck_soldier.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "enemies/red_fireball_triple.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "enemies/red_flame.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "enemies/red_hardhat_beetle.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "enemies/red_helmasaur.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "enemies/red_knight_soldier.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "enemies/red_pig_soldier.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "enemies/ropa.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "enemies/simple_green_soldier.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "enemies/skeletor.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "enemies/snap_dragon.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "enemies/tentacle.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "equipment.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "fonts", license = "Mixed" }
+file{ path = "fonts/green_digits.png", author = "Nintendo", license = "Proprietary (Fair use)" }
+file{ path = "fonts/la.ttf", author = "Nintendo", license = "Proprietary (Fair use)" }
+file{ path = "fonts/minecraftia.ttf", author = "Andrew Tyler", license = "Free for non-commercial use" }
+file{ path = "fonts/small_green_digits.png", author = "Nintendo", license = "Proprietary (Fair use)" }
+file{ path = "fonts/small_white_digits.png", author = "Nintendo", license = "Proprietary (Fair use)" }
+file{ path = "fonts/white_digits.png", author = "Nintendo", license = "Proprietary (Fair use)" }
+file{ path = "fonts/wqy-zenhei.ttc", author = "WenQuanYi project: http://wenq.org/en", license = "GPL v2" }
+file{ path = "hud", author = "Christopho", license = "GPL v3" }
+file{ path = "hud/action_icon.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "hud/attack_icon.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "hud/floor.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "hud/hearts.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "hud/hud.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "hud/item_icon.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "hud/magic_bar.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "hud/pause_icon.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "hud/rupees.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "hud/small_keys.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "items", author = "Christopho", license = "GPL v3" }
+file{ path = "items/apple.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "items/apples_counter.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "items/arrow.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "items/big_key.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "items/blue_potion.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "items/bomb.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "items/bomb_bag.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "items/bombs_counter.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "items/bone_key.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "items/boomerang.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "items/boss_key.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "items/bottle.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "items/bottle_1.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "items/bottle_2.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "items/bottle_3.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "items/bottle_4.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "items/bow.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "items/cane_of_somaria.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "items/clay_key.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "items/compass.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "items/croissant.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "items/croissants_counter.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "items/fairy.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "items/feather.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "items/fire_stone.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "items/fire_stones_counter.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "items/flippers.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "items/glove.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "items/green_potion.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "items/heart.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "items/heart_container.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "items/hookshot.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "items/ice_key.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "items/iron_key.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "items/lamp.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "items/level_4_way.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "items/magic_bar.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "items/magic_cape.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "items/magic_flask.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "items/map.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "items/mystic_mirror.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "items/pain_au_chocolat.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "items/pains_au_chocolat_counter.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "items/pegasus_shoes.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "items/piece_of_heart.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "items/quiver.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "items/random.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "items/red_potion.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "items/rock_key.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "items/rupee.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "items/rupee_bag.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "items/shield.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "items/small_key.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "items/stone_key.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "items/sword.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "items/tunic.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "items/wooden_key.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "items/world_map.lua", author = "Christopho", license = "GPL v3" }
+file{ path = "languages", license = "Mixed" }
+file{ path = "languages/de", license = "Mixed" }
+file{ path = "languages/de/images", author = "Nintendo", license = "Proprietary (Fair use)" }
+file{ path = "languages/de/images/action_icon.png", author = "Nintendo, Metallizer", license = "Proprietary (Fair use)" }
+file{ path = "languages/de/images/floors.png", author = "Nintendo", license = "Proprietary (Fair use)" }
+file{ path = "languages/de/images/gameover_menu.png", author = "Nintendo", license = "Proprietary (Fair use)" }
+file{ path = "languages/de/images/pause_icon.png", author = "Nintendo, Metallizer", license = "Proprietary (Fair use)" }
+file{ path = "languages/de/images/pause_submenus.png", author = "Nintendo", license = "Proprietary (Fair use)" }
+file{ path = "languages/de/images/sword_icon.png", author = "Nintendo, Metallizer", license = "Proprietary (Fair use)" }
+file{ path = "languages/de/images/title_screen_initialization.png", author = "Metallizer", license = "Proprietary (Fair use)" }
+file{ path = "languages/de/text", author = "Elenya", license = "CC BY-SA 4.0" }
+file{ path = "languages/de/text/dialogs.dat", author = "Elenya", license = "CC BY-SA 4.0" }
+file{ path = "languages/de/text/strings.dat", author = "Elenya", license = "CC BY-SA 4.0" }
+file{ path = "languages/en", license = "Mixed" }
+file{ path = "languages/en/images", author = "Nintendo", license = "Proprietary (Fair use)" }

zsdx-1.11.0.tar.gz/data/quest.dat -> zsdx-1.12.0.tar.xz/data/quest.dat Changed

zsdx-1.12.0.tar.xz/data/sounds/diarandor Added

zsdx-1.12.0.tar.xz/data/sounds/diarandor/solarus_logo.ogg Added

zsdx-1.12.0.tar.xz/data/sounds/zonzifleur Added

zsdx-1.12.0.tar.xz/data/sounds/zonzifleur/solarus_team_logo.ogg Added

zsdx-1.12.0.tar.xz/data/sprites/menus/team_logo.dat Added

zsdx-1.12.0.tar.xz/data/sprites/menus/team_logo.png Added

zsdx-1.12.0.tar.xz/data/sprites/menus/team_logo_text.png Added

zsdx-1.11.0.tar.gz/license.txt -> zsdx-1.12.0.tar.xz/license.txt Changed

@@ -1,140 +1,24 @@
+We give in this file the license information of
+the Zelda Mystery of Solarus DX quest for Solarus.
+
 - Lua scripts are licensed under the terms of the GNU General Public License
 in version 3.
 
-- All data files we created are licensed under
-Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0).
-http://creativecommons.org/licenses/by-sa/3.0/
-
 - Some graphics, sounds and names include content that belong to Nintendo.
-We don't own this content.
-
-Scripts under GNU GPL v3:
--------------------------
-**.lua
-
-Data files under CC BY-SA 3.0:                      Author (if not us)
-------------------------------                      ------------------
-**.dat
-sprites/enemies/arbror_root.png
-sprites/enemies/bee_guard.png
-sprites/enemies/billy.png
-sprites/enemies/*_bullblin.png
-sprites/enemies/*_dogman.png
-sprites/enemies/*_duck_soldier.png
-sprites/enemies/*_pig_soldier.png
-sprites/enemies/drakomos*.png
-sprites/enemies/firebird.png
-sprites/enemies/fire_circle.png
-sprites/enemies/flora_gohma.png
-sprites/enemies/gelidrak.png
-sprites/enemies/globul.png
-sprites/enemies/khorneth.png
-sprites/enemies/khotor.png
-sprites/enemies/lizalfos.png
-sprites/enemies/mandible.png
-sprites/enemies/master_arbror.png
-sprites/enemies/minillosaur_egg.png
-sprites/enemies/mini_mowatulla.png
-sprites/enemies/mowatulla.png
-sprites/enemies/papillosaur_king.png
-sprites/enemies/poutroxor.png
-sprites/enemies/skeletor.png
-sprites/entities/conveyor_belt.png
-sprites/entities/fresco.png
-sprites/hud/dialog_box.png
-sprites/hud/icons_flip.png
-sprites/hud/item_icon_*.png
-sprites/hud/magic_bar.png
-sprites/hud/rupee_icon.png
-sprites/menus/dungeon_maps/*.png
-sprites/menus/arrow.png
-sprites/menus/dungeon_map_background.png
-sprites/menus/hero_point.png
-sprites/menus/options_cursor.png
-sprites/menus/outside_world_clouds.png
-sprites/menus/pause_cursor.png
-sprites/menus/pause_save_dialog.png
-sprites/menus/quest_status_*.png
-sprites/menus/selection_menu_background.png
-sprites/menus/selection_menu_cloud.png
-sprites/menus/selection_menu_cursor.png
-sprites/menus/selection_menu_mode.png
-sprites/menus/selection_menu_option_container.png
-sprites/menus/selection_menu_save*.png
-sprites/menus/selection_menu_save_container.png
-sprites/menus/title_daylight_*.png
-sprites/menus/title_dx.png
-sprites/menus/title_night_*.png
-sprites/menus/title_star.png
-sprites/menus/title_sunset_*.png
-sprites/npc/inferno.png
-sprites/npc/newlink.png
-sprites/npc/solarus_child*.png
-text/minecraftia.png                                Andrew Tyler: http://www.andrewtyler.net
+We don't own this content. We provide it under fair use.
 
-Data files under GNU GPL v2:
--------------------------
-text/wqy-zenhei.ttc                                 WenQuanYi project: http://wenq.org/en
+- Data files we created are licensed under
+Creative Commons Attribution-ShareAlike 4.0 (CC BY-SA 4.0).
+http://creativecommons.org/licenses/by-sa/4.0/
 
-Files with original content (CC BY-SA 3.0) but with a Nintendo filename:
-------------------------------------------------------------------------
-sprites/enemies/agahnim.png
-sprites/enemies/agahnim_fake.png
+More detailed information about the authors and license of every file
+is displayed when you open this project with Solarus Quest Editor.
 
-Files that include content from Nintendo:
------------------------------------------
-languages/*/images/*.png
-musics/*
-sounds/*
-text/*.png
-text/la.ttf
-tilesets/*.png
-sprites/enemies/blue_flame.png
-sprites/enemies/*_knight_soldier.png
-sprites/enemies/bubble.png
-sprites/enemies/chain_and_ball.png
-sprites/enemies/enemy_killed.png
-sprites/enemies/fireball_triple.png
-sprites/enemies/fire_bat.png
-sprites/enemies/ganon.png
-sprites/enemies/gibdo.png
-sprites/enemies/hardhat_bettle.png
-sprites/enemies/laser.png
-sprites/enemies/pike.png
-sprites/enemies/red_flame.png
-sprites/enemies/red_helmasaur.png
-sprites/enemies/ropa.png
-sprites/enemies/simple_green_soldier.png
-sprites/enemies/snap_dragon.png
-sprites/enemies/tentacle.png
-sprites/entities/arrow.png
-sprites/entities/bed.png
-sprites/entities/bomb.png
-sprites/entities/boomerang.png
-sprites/entities/chest.png
-sprites/entities/dark*.png
-sprites/entities/explosion.png
-sprites/entities/hookshot.png
-sprites/entities/items.png
-sprites/entities/miscellaneous.png
-sprites/entities/quest_entities.png
-sprites/entities/shadow.png
-sprites/entities/slot_machine.png
-sprites/entities/teletransporter.png
-sprites/entities/the_end.png
-sprites/entities/vine.png
-sprites/hero/*.png
-sprites/hud/dialog_icons.png
-sprites/hud/digits.png
-sprites/hud/gameover_fade.png
-sprites/hud/hearts.png
-sprites/hud/small_key_icon.png
-sprites/menus/dungeon_map_icons.png
-sprites/menus/hero_head.png
-sprites/menus/outside_world_map.png
-sprites/menus/selection_menu_letters.png
-sprites/menus/title_logo.png
-sprites/npc/alttp.png
-sprites/npc/black_knight_soldier.png
-sprites/npc/witch.png
+This quest was made by the Solarus team.
 
+Main contributors:
+- Christopho
+- Metallizer
+- Newlink
+- Binbin
+- Olivier Cléro

zsdx-1.11.0.tar.gz/readme.md -> zsdx-1.12.0.tar.xz/readme.md Changed

zsdx-1.12.0.tar.xz/zsdx.desktop Added

Changes of Revision 4