From 383603f788d975954da3338ab71682a856cefbf3 Mon Sep 17 00:00:00 2001 From: Sveinung Kvilhaugsvik Date: Wed, 10 Feb 2021 16:27:15 +0100 Subject: [PATCH] Prefix all unit action result names with "Unit". Prepare for more than one actor kind by prefixing the ruleset name off all actions results exclusive to unit actors with "Unit". Do this now, before action result names leaks into the ruleset and are frozen. See osdn #41547 --- common/fc_types.h | 118 +++++++++++++++++++++++----------------------- 1 file changed, 59 insertions(+), 59 deletions(-) diff --git a/common/fc_types.h b/common/fc_types.h index 364a68cc81..776ee6daf5 100644 --- a/common/fc_types.h +++ b/common/fc_types.h @@ -174,123 +174,123 @@ enum output_type_id { /* Values used in the network protocol. */ #define SPECENUM_NAME action_result #define SPECENUM_VALUE0 ACTRES_ESTABLISH_EMBASSY -#define SPECENUM_VALUE0NAME "Establish Embassy" +#define SPECENUM_VALUE0NAME "Unit Establish Embassy" #define SPECENUM_VALUE1 ACTRES_SPY_INVESTIGATE_CITY -#define SPECENUM_VALUE1NAME "Investigate City" +#define SPECENUM_VALUE1NAME "Unit Investigate City" #define SPECENUM_VALUE2 ACTRES_SPY_POISON -#define SPECENUM_VALUE2NAME "Poison City" +#define SPECENUM_VALUE2NAME "Unit Poison City" #define SPECENUM_VALUE3 ACTRES_SPY_STEAL_GOLD -#define SPECENUM_VALUE3NAME "Steal Gold" +#define SPECENUM_VALUE3NAME "Unit Steal Gold" #define SPECENUM_VALUE4 ACTRES_SPY_SABOTAGE_CITY -#define SPECENUM_VALUE4NAME "Sabotage City" +#define SPECENUM_VALUE4NAME "Unit Sabotage City" #define SPECENUM_VALUE5 ACTRES_SPY_TARGETED_SABOTAGE_CITY -#define SPECENUM_VALUE5NAME "Targeted Sabotage City" +#define SPECENUM_VALUE5NAME "Unit Targeted Sabotage City" #define SPECENUM_VALUE6 ACTRES_SPY_SABOTAGE_CITY_PRODUCTION -#define SPECENUM_VALUE6NAME "Sabotage City Production" +#define SPECENUM_VALUE6NAME "Unit Sabotage City Production" #define SPECENUM_VALUE7 ACTRES_SPY_STEAL_TECH -#define SPECENUM_VALUE7NAME "Steal Tech" +#define SPECENUM_VALUE7NAME "Unit Steal Tech" #define SPECENUM_VALUE8 ACTRES_SPY_TARGETED_STEAL_TECH -#define SPECENUM_VALUE8NAME "Targeted Steal Tech" +#define SPECENUM_VALUE8NAME "Unit Targeted Steal Tech" #define SPECENUM_VALUE9 ACTRES_SPY_INCITE_CITY -#define SPECENUM_VALUE9NAME "Incite City" +#define SPECENUM_VALUE9NAME "Unit Incite City" #define SPECENUM_VALUE10 ACTRES_TRADE_ROUTE -#define SPECENUM_VALUE10NAME "Establish Trade Route" +#define SPECENUM_VALUE10NAME "Unit Establish Trade Route" #define SPECENUM_VALUE11 ACTRES_MARKETPLACE -#define SPECENUM_VALUE11NAME "Enter Marketplace" +#define SPECENUM_VALUE11NAME "Unit Enter Marketplace" #define SPECENUM_VALUE12 ACTRES_HELP_WONDER -#define SPECENUM_VALUE12NAME "Help Wonder" +#define SPECENUM_VALUE12NAME "Unit Help Wonder" #define SPECENUM_VALUE13 ACTRES_SPY_BRIBE_UNIT -#define SPECENUM_VALUE13NAME "Bribe Unit" +#define SPECENUM_VALUE13NAME "Unit Bribe Unit" #define SPECENUM_VALUE14 ACTRES_SPY_SABOTAGE_UNIT -#define SPECENUM_VALUE14NAME "Sabotage Unit" +#define SPECENUM_VALUE14NAME "Unit Sabotage Unit" #define SPECENUM_VALUE15 ACTRES_CAPTURE_UNITS -#define SPECENUM_VALUE15NAME "Capture Units" +#define SPECENUM_VALUE15NAME "Unit Capture Units" #define SPECENUM_VALUE16 ACTRES_FOUND_CITY -#define SPECENUM_VALUE16NAME "Found City" +#define SPECENUM_VALUE16NAME "Unit Found City" #define SPECENUM_VALUE17 ACTRES_JOIN_CITY -#define SPECENUM_VALUE17NAME "Join City" +#define SPECENUM_VALUE17NAME "Unit Join City" #define SPECENUM_VALUE18 ACTRES_STEAL_MAPS -#define SPECENUM_VALUE18NAME "Steal Maps" +#define SPECENUM_VALUE18NAME "Unit Steal Maps" #define SPECENUM_VALUE19 ACTRES_BOMBARD -#define SPECENUM_VALUE19NAME "Bombard" +#define SPECENUM_VALUE19NAME "Unit Bombard" #define SPECENUM_VALUE20 ACTRES_SPY_NUKE -#define SPECENUM_VALUE20NAME "Suitcase Nuke" +#define SPECENUM_VALUE20NAME "Unit Suitcase Nuke" #define SPECENUM_VALUE21 ACTRES_NUKE -#define SPECENUM_VALUE21NAME "Explode Nuclear" +#define SPECENUM_VALUE21NAME "Unit Explode Nuclear" #define SPECENUM_VALUE22 ACTRES_NUKE_CITY -#define SPECENUM_VALUE22NAME "Nuke City" +#define SPECENUM_VALUE22NAME "Unit Nuke City" #define SPECENUM_VALUE23 ACTRES_NUKE_UNITS -#define SPECENUM_VALUE23NAME "Nuke Units" +#define SPECENUM_VALUE23NAME "Unit Nuke Units" #define SPECENUM_VALUE24 ACTRES_DESTROY_CITY -#define SPECENUM_VALUE24NAME "Destroy City" +#define SPECENUM_VALUE24NAME "Unit Destroy City" #define SPECENUM_VALUE25 ACTRES_EXPEL_UNIT -#define SPECENUM_VALUE25NAME "Expel Unit" +#define SPECENUM_VALUE25NAME "Unit Expel Unit" #define SPECENUM_VALUE26 ACTRES_RECYCLE_UNIT -#define SPECENUM_VALUE26NAME "Recycle Unit" +#define SPECENUM_VALUE26NAME "Unit Recycle" #define SPECENUM_VALUE27 ACTRES_DISBAND_UNIT -#define SPECENUM_VALUE27NAME "Disband Unit" +#define SPECENUM_VALUE27NAME "Unit Disband" #define SPECENUM_VALUE28 ACTRES_HOME_CITY -#define SPECENUM_VALUE28NAME "Home City" +#define SPECENUM_VALUE28NAME "Unit Home City" #define SPECENUM_VALUE29 ACTRES_UPGRADE_UNIT -#define SPECENUM_VALUE29NAME "Upgrade Unit" +#define SPECENUM_VALUE29NAME "Unit Upgrade" #define SPECENUM_VALUE30 ACTRES_PARADROP -#define SPECENUM_VALUE30NAME "Paradrop Unit" +#define SPECENUM_VALUE30NAME "Unit Paradrop" #define SPECENUM_VALUE31 ACTRES_AIRLIFT -#define SPECENUM_VALUE31NAME "Airlift Unit" +#define SPECENUM_VALUE31NAME "Unit Airlift" #define SPECENUM_VALUE32 ACTRES_ATTACK -#define SPECENUM_VALUE32NAME "Attack" +#define SPECENUM_VALUE32NAME "Unit Attack" #define SPECENUM_VALUE33 ACTRES_STRIKE_BUILDING -#define SPECENUM_VALUE33NAME "Surgical Strike Building" +#define SPECENUM_VALUE33NAME "Unit Surgical Strike Building" #define SPECENUM_VALUE34 ACTRES_STRIKE_PRODUCTION -#define SPECENUM_VALUE34NAME "Surgical Strike Production" +#define SPECENUM_VALUE34NAME "Unit Surgical Strike Production" #define SPECENUM_VALUE35 ACTRES_CONQUER_CITY -#define SPECENUM_VALUE35NAME "Conquer City" +#define SPECENUM_VALUE35NAME "Unit Conquer City" #define SPECENUM_VALUE36 ACTRES_HEAL_UNIT -#define SPECENUM_VALUE36NAME "Heal Unit" +#define SPECENUM_VALUE36NAME "Unit Heal Unit" #define SPECENUM_VALUE37 ACTRES_TRANSFORM_TERRAIN -#define SPECENUM_VALUE37NAME "Transform Terrain" +#define SPECENUM_VALUE37NAME "Unit Transform Terrain" #define SPECENUM_VALUE38 ACTRES_CULTIVATE -#define SPECENUM_VALUE38NAME "Cultivate" +#define SPECENUM_VALUE38NAME "Unit Cultivate" #define SPECENUM_VALUE39 ACTRES_PLANT -#define SPECENUM_VALUE39NAME "Plant" +#define SPECENUM_VALUE39NAME "Unit Plant" #define SPECENUM_VALUE40 ACTRES_PILLAGE -#define SPECENUM_VALUE40NAME "Pillage" +#define SPECENUM_VALUE40NAME "Unit Pillage" #define SPECENUM_VALUE41 ACTRES_FORTIFY -#define SPECENUM_VALUE41NAME "Fortify" +#define SPECENUM_VALUE41NAME "Unit Fortify" #define SPECENUM_VALUE42 ACTRES_ROAD -#define SPECENUM_VALUE42NAME "Build Road" +#define SPECENUM_VALUE42NAME "Unit Build Road" #define SPECENUM_VALUE43 ACTRES_CONVERT -#define SPECENUM_VALUE43NAME "Convert Unit" +#define SPECENUM_VALUE43NAME "Unit Convert" #define SPECENUM_VALUE44 ACTRES_BASE -#define SPECENUM_VALUE44NAME "Build Base" +#define SPECENUM_VALUE44NAME "Unit Build Base" #define SPECENUM_VALUE45 ACTRES_MINE -#define SPECENUM_VALUE45NAME "Build Mine" +#define SPECENUM_VALUE45NAME "Unit Build Mine" #define SPECENUM_VALUE46 ACTRES_IRRIGATE -#define SPECENUM_VALUE46NAME "Build Irrigation" +#define SPECENUM_VALUE46NAME "Unit Build Irrigation" #define SPECENUM_VALUE47 ACTRES_CLEAN_POLLUTION -#define SPECENUM_VALUE47NAME "Clean Pollution" +#define SPECENUM_VALUE47NAME "Unit Clean Pollution" #define SPECENUM_VALUE48 ACTRES_CLEAN_FALLOUT -#define SPECENUM_VALUE48NAME "Clean Fallout" +#define SPECENUM_VALUE48NAME "Unit Clean Fallout" #define SPECENUM_VALUE49 ACTRES_TRANSPORT_ALIGHT -#define SPECENUM_VALUE49NAME "Transport Alight" +#define SPECENUM_VALUE49NAME "Unit Transport Alight" #define SPECENUM_VALUE50 ACTRES_TRANSPORT_UNLOAD -#define SPECENUM_VALUE50NAME "Transport Unload" +#define SPECENUM_VALUE50NAME "Unit Transport Unload" #define SPECENUM_VALUE51 ACTRES_TRANSPORT_DISEMBARK -#define SPECENUM_VALUE51NAME "Transport Disembark" +#define SPECENUM_VALUE51NAME "Unit Transport Disembark" #define SPECENUM_VALUE52 ACTRES_TRANSPORT_BOARD -#define SPECENUM_VALUE52NAME "Transport Board" +#define SPECENUM_VALUE52NAME "Unit Transport Board" #define SPECENUM_VALUE53 ACTRES_TRANSPORT_EMBARK -#define SPECENUM_VALUE53NAME "Transport Embark" +#define SPECENUM_VALUE53NAME "Unit Transport Embark" #define SPECENUM_VALUE54 ACTRES_SPY_SPREAD_PLAGUE -#define SPECENUM_VALUE54NAME "Spread Plague" +#define SPECENUM_VALUE54NAME "Unit Spread Plague" #define SPECENUM_VALUE55 ACTRES_SPY_ATTACK -#define SPECENUM_VALUE55NAME "Spy Attack" +#define SPECENUM_VALUE55NAME "Unit Spy Attack" #define SPECENUM_VALUE56 ACTRES_CONQUER_EXTRAS -#define SPECENUM_VALUE56NAME "Conquer Extras" +#define SPECENUM_VALUE56NAME "Unit Conquer Extras" #define SPECENUM_VALUE57 ACTRES_HUT_ENTER -#define SPECENUM_VALUE57NAME "Enter Hut" +#define SPECENUM_VALUE57NAME "Unit Enter Hut" #define SPECENUM_VALUE58 ACTRES_HUT_FRIGHTEN -#define SPECENUM_VALUE58NAME "Frighten Hut" +#define SPECENUM_VALUE58NAME "Unit Frighten Hut" /* All consequences are handled as (ruleset) action data. */ #define SPECENUM_COUNT ACTRES_NONE #include "specenum_gen.h" -- 2.20.1