From c4d60195996a815ceb7a2c4df0a105b2bb2c168f Mon Sep 17 00:00:00 2001 From: leper Date: Sun, 20 May 2012 15:44:57 +0000 Subject: [PATCH] Add garrison order sound and remove the old garrison sound. Fix some map errors, tabs in templates and update docs. This was SVN commit r11891. --- binaries/data/mods/public/gui/session/input.js | 2 +- .../data/mods/public/maps/scenarios/Hellenic Buildings.xml | 4 ++-- binaries/data/mods/public/maps/scenarios/Miletus.xml | 4 ++-- binaries/data/mods/public/maps/scenarios/Walls.xml | 4 ++-- binaries/data/mods/public/simulation/components/UnitAI.js | 1 - .../data/mods/public/simulation/templates/template_unit.xml | 2 +- .../public/simulation/templates/template_unit_champion.xml | 2 +- .../public/simulation/templates/template_unit_infantry.xml | 2 +- .../templates/template_unit_support_female_citizen.xml | 3 ++- .../simulation/templates/units/cart_support_healer_b.xml | 3 ++- .../simulation/templates/units/celt_hero_boudicca.xml | 3 ++- .../simulation/templates/units/iber_support_healer_b.xml | 3 ++- source/simulation2/docs/SimulationDocs.h | 6 +++--- 13 files changed, 21 insertions(+), 18 deletions(-) diff --git a/binaries/data/mods/public/gui/session/input.js b/binaries/data/mods/public/gui/session/input.js index 3314920766..8ac9142b3f 100644 --- a/binaries/data/mods/public/gui/session/input.js +++ b/binaries/data/mods/public/gui/session/input.js @@ -1302,7 +1302,7 @@ function doAction(action, ev) case "garrison": Engine.PostNetworkCommand({"type": "garrison", "entities": selection, "target": action.target, "queued": queued}); - // TODO: Play a sound? + Engine.GuiInterfaceCall("PlaySound", { "name": "order_garrison", "entity": selection[0] }); return true; case "set-rallypoint": diff --git a/binaries/data/mods/public/maps/scenarios/Hellenic Buildings.xml b/binaries/data/mods/public/maps/scenarios/Hellenic Buildings.xml index a948271738..ffa5460548 100644 --- a/binaries/data/mods/public/maps/scenarios/Hellenic Buildings.xml +++ b/binaries/data/mods/public/maps/scenarios/Hellenic Buildings.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:878588a947233c406dcedd1f7c1f70f5226e85ba0bd7980acccf763a4e875f2b -size 80766 +oid sha256:27e2a444282aa3dfe9a0ff6221cf14defeb22f8526e90fa491c708ab69d01d80 +size 80787 diff --git a/binaries/data/mods/public/maps/scenarios/Miletus.xml b/binaries/data/mods/public/maps/scenarios/Miletus.xml index eac62ce110..2b8d35823f 100644 --- a/binaries/data/mods/public/maps/scenarios/Miletus.xml +++ b/binaries/data/mods/public/maps/scenarios/Miletus.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:049e5b33c182f39cc5c9c7a39906364879512511c3263e79be62792ed2b94927 -size 207986 +oid sha256:1131429693b828964a6b99a74de8ef7718993616793982b132748e3548b969cb +size 207875 diff --git a/binaries/data/mods/public/maps/scenarios/Walls.xml b/binaries/data/mods/public/maps/scenarios/Walls.xml index fd00420582..b5cdbffc1d 100644 --- a/binaries/data/mods/public/maps/scenarios/Walls.xml +++ b/binaries/data/mods/public/maps/scenarios/Walls.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:69dab403e5a5355dc671d9637d64d0832cc9990c8b884fdbd67c2419da1de364 -size 216446 +oid sha256:4b17903e1acc8a052b4ea697a22dca4ff3e4b8228a402422e5f920a412fb7cdc +size 216530 diff --git a/binaries/data/mods/public/simulation/components/UnitAI.js b/binaries/data/mods/public/simulation/components/UnitAI.js index 587a236627..2d38f61868 100644 --- a/binaries/data/mods/public/simulation/components/UnitAI.js +++ b/binaries/data/mods/public/simulation/components/UnitAI.js @@ -1502,7 +1502,6 @@ var UnitFsmSpec = { "APPROACHING": { "enter": function() { this.SelectAnimation("walk", false, this.GetWalkSpeed()); - this.PlaySound("walk"); }, "MoveCompleted": function() { diff --git a/binaries/data/mods/public/simulation/templates/template_unit.xml b/binaries/data/mods/public/simulation/templates/template_unit.xml index 416c0b8011..58b1c9f34f 100644 --- a/binaries/data/mods/public/simulation/templates/template_unit.xml +++ b/binaries/data/mods/public/simulation/templates/template_unit.xml @@ -71,7 +71,7 @@ 2.0 1.0 - 1 + 1 20 diff --git a/binaries/data/mods/public/simulation/templates/template_unit_champion.xml b/binaries/data/mods/public/simulation/templates/template_unit_champion.xml index ce00e7bf08..11b332ec6f 100644 --- a/binaries/data/mods/public/simulation/templates/template_unit_champion.xml +++ b/binaries/data/mods/public/simulation/templates/template_unit_champion.xml @@ -5,7 +5,7 @@ Champion Unit - Champion Organic + Champion Organic 150 diff --git a/binaries/data/mods/public/simulation/templates/template_unit_infantry.xml b/binaries/data/mods/public/simulation/templates/template_unit_infantry.xml index 7c46c878ec..3cdfb5f302 100644 --- a/binaries/data/mods/public/simulation/templates/template_unit_infantry.xml +++ b/binaries/data/mods/public/simulation/templates/template_unit_infantry.xml @@ -19,7 +19,7 @@ structures/{civ}_barracks structures/{civ}_dock structures/{civ}_outpost - other/wallset_palisade + other/wallset_palisade structures/{civ}_defense_tower structures/{civ}_wallset_stone structures/{civ}_fortress diff --git a/binaries/data/mods/public/simulation/templates/template_unit_support_female_citizen.xml b/binaries/data/mods/public/simulation/templates/template_unit_support_female_citizen.xml index 1bb1351889..791fa3d50f 100644 --- a/binaries/data/mods/public/simulation/templates/template_unit_support_female_citizen.xml +++ b/binaries/data/mods/public/simulation/templates/template_unit_support_female_citizen.xml @@ -75,7 +75,8 @@ voice/hellenes/civ/female/civ_female_walk.xml voice/hellenes/civ/female/civ_female_go_out_against.xml voice/hellenes/civ/female/civ_female_gather_together.xml - voice/hellenes/civ/female/civ_female_retreat.xml + voice/hellenes/civ/female/civ_female_repair.xml + voice/hellenes/civ/female/civ_female_garrison.xml attack/weapon/sword.xml resource/construction/con_wood.xml diff --git a/binaries/data/mods/public/simulation/templates/units/cart_support_healer_b.xml b/binaries/data/mods/public/simulation/templates/units/cart_support_healer_b.xml index bd1e2ce018..a3ac510b4b 100644 --- a/binaries/data/mods/public/simulation/templates/units/cart_support_healer_b.xml +++ b/binaries/data/mods/public/simulation/templates/units/cart_support_healer_b.xml @@ -18,8 +18,9 @@ voice/hellenes/civ/female/civ_female_walk.xml voice/hellenes/civ/female/civ_female_go_out_against.xml voice/hellenes/civ/female/civ_female_gather_together.xml - voice/hellenes/civ/female/civ_female_retreat.xml + voice/hellenes/civ/female/civ_female_repair.xml voice/hellenes/civ/female/civ_female_heal.xml + voice/hellenes/civ/female/civ_female_garrison.xml diff --git a/binaries/data/mods/public/simulation/templates/units/celt_hero_boudicca.xml b/binaries/data/mods/public/simulation/templates/units/celt_hero_boudicca.xml index ad0ae6b1fa..e2e5fc7f9a 100644 --- a/binaries/data/mods/public/simulation/templates/units/celt_hero_boudicca.xml +++ b/binaries/data/mods/public/simulation/templates/units/celt_hero_boudicca.xml @@ -40,7 +40,8 @@ voice/hellenes/civ/female/civ_female_walk.xml voice/hellenes/civ/female/civ_female_go_out_against.xml voice/hellenes/civ/female/civ_female_gather_together.xml - voice/hellenes/civ/female/civ_female_retreat.xml + voice/hellenes/civ/female/civ_female_repair.xml + voice/hellenes/civ/female/civ_female_garrison.xml diff --git a/binaries/data/mods/public/simulation/templates/units/iber_support_healer_b.xml b/binaries/data/mods/public/simulation/templates/units/iber_support_healer_b.xml index 86cd94a02c..2a3baaa150 100644 --- a/binaries/data/mods/public/simulation/templates/units/iber_support_healer_b.xml +++ b/binaries/data/mods/public/simulation/templates/units/iber_support_healer_b.xml @@ -17,8 +17,9 @@ voice/hellenes/civ/female/civ_female_walk.xml voice/hellenes/civ/female/civ_female_go_out_against.xml voice/hellenes/civ/female/civ_female_gather_together.xml - voice/hellenes/civ/female/civ_female_retreat.xml + voice/hellenes/civ/female/civ_female_repair.xml voice/hellenes/civ/female/civ_female_heal.xml + voice/hellenes/civ/female/civ_female_garrison.xml diff --git a/source/simulation2/docs/SimulationDocs.h b/source/simulation2/docs/SimulationDocs.h index 3eebd59cde..b5056d243d 100644 --- a/source/simulation2/docs/SimulationDocs.h +++ b/source/simulation2/docs/SimulationDocs.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2010 Wildfire Games. +/* Copyright (C) 2012 Wildfire Games. * This file is part of 0 A.D. * * 0 A.D. is free software: you can redistribute it and/or modify @@ -552,7 +552,7 @@ In C++, use CmpPtr (see its class documentation for details): #include "simulation2/components/ICmpPosition.h" ... CmpPtr cmpPosition(context, ent); -if (cmpPosition.null()) +if (!cmpPosition) // do something to avoid dereferencing null pointers cmpPosition->MoveTo(x, y); @endcode @@ -609,7 +609,7 @@ Engine.LoadComponentScript("ExampleTwo.js"); var cmp = ConstructComponent(1, "ExampleTwo"); @endcode -where @c Example.js is the component script to test, @c 1 is the entity ID, @c "ExampleTwo" is the component name. +where @c ExampleTwo.js is the component script to test, @c 1 is the entity ID, @c "ExampleTwo" is the component name. Then call methods on @c cmp to test it, using the @c TS_* functions defined in @b binaries/data/tests/test_setup.js for common assertions.