Ticket #3013: 3013.2.diff

File 3013.2.diff, 5.4 KB (added by Stan, 8 years ago)

Rebase of Fabio's patch

  • ps/trunk/binaries/data/mods/public/gui/gamesetup/gamesetup.js

     
    6666    {
    6767        "id": "default",
    6868        "name": translate("Default"),
    69         "filter": mapKeywords => mapKeywords.every(keyword => ["naval", "demo", "hidden"].indexOf(keyword) == -1)
     69        "filter": mapKeywords => mapKeywords.every(keyword => ["trigger", "naval", "demo", "hidden"].indexOf(keyword) == -1)
    7070    },
    7171    {
    7272        "id": "naval",
     
    7979        "filter": mapKeywords => mapKeywords.indexOf("demo") != -1
    8080    },
    8181    {
     82        "id": "trigger",
     83        "name": translate("Trigger Maps")
     84        "filter": mapKeywords => mapKeywords.indexOf("trigger") != -1
     85    },
     86    {
    8287        "id": "all",
    8388        "name": translate("All Maps"),
    8489        "filter": mapKeywords => true
  • ps/trunk/binaries/data/mods/public/maps/random/survivalofthefittest.json

     
    55        "Description" : "[color=\"red\"]IMPORTANT NOTE: AI PLAYERS DO NOT WORK WITH THIS MAP[/color]\n\nProtect your base against endless waves of enemies. Use your woman citizen to collect the treasures at the center of the map before others do, and try to build your base up. The last player remaining will be the winner!",
    66        "BaseTerrain" : ["medit_sea_depths"],
    77        "BaseHeight" : 30,
     8        "Keywords": ["trigger"],
    89        "Preview" : "survivalofthefittest.png",
    910        "CircularMap" : true,
    1011        "TriggerScripts": [
  • ps/trunk/binaries/data/mods/public/maps/scenarios/Introductory

     
    4545  "Description": "This is a basic tutorial to get you started playing 0 A.D.",
    4646  "GameType": "conquest",
    4747  "Keywords": [
     48    "trigger",
    4849    "demo"
    4950  ],
    5051  "LockTeams": false,
  • ps/trunk/binaries/data/mods/public/maps/scenarios/starting_economy_walkthrough.xml

     
    5353  "Description": "This map will give a rough guide for starting the game effectively.  Early in the game the most important thing is to gather resources as fast as possible so you are able to build enough troops later.\u000a\u000aWarning: This is very fast at the start, be prepared to run through the initial bit several times.",
    5454  "GameType": "conquest",
    5555  "Keywords": [
     56    "trigger",
    5657    "demo"
    5758  ],
    5859  "LockTeams": false,
  • ps/trunk/binaries/data/mods/public/maps/scenarios/Treasure

     
    4848  "Description": "Search treasures on small islands and on the water. Collect more treasures than your opponent to win.",
    4949  "GameType": "conquest",
    5050  "Keywords": [
     51    "trigger",
    5152    "naval"
    5253  ],
    5354  "LockTeams": false,
  • ps/trunk/binaries/data/mods/public/maps/scenarios/Triggers_demo.xml

     
    4848  "Description": "Demo map listening to various triggers and printing warning messages about them",
    4949  "GameType": "endless",
    5050  "Keywords": [
     51    "trigger",
    5152    "demo"
    5253  ],
    5354  "LockTeams": false,
  • ps/trunk/binaries/data/mods/public/maps/scenarios/Units_demo.xml

     
    9393    {
    9494        "Name":"Units Demo",
    9595        "Description":"Every unit in the game.",
    96         "Keywords": ["demo"],
     96        "Keywords": [
     97          "trigger",
     98          "demo"
     99        ],
    97100        "PlayerData":
    98101        [
    99102            {
  • ps/trunk/binaries/data/mods/public/maps/skirmishes/Gallic

     
    4343  "CircularMap": true,
    4444  "Description": "Defend your Gallic outpost against attacks from your treacherous neighbors!\n\nEach player begins the match with a wooden palisade and some guard towers atop a low embankment.\n\nWatch out for Romans passing by!",
    4545  "GameType": "conquest",
    46   "Keywords": [],
     46  "Keywords": [
     47    "trigger"
     48  ],
    4749  "LockTeams": false,
    4850  "Name": "Gallic Fields (3)",
    4951  "PlayerData": [