diff --git a/Mods/ArchipelagoCore.SC2Mod/Base.SC2Data/Lib5BD4895D.galaxy b/Mods/ArchipelagoCore.SC2Mod/Base.SC2Data/Lib5BD4895D.galaxy index 74aa96d95..85ce56fc8 100644 --- a/Mods/ArchipelagoCore.SC2Mod/Base.SC2Data/Lib5BD4895D.galaxy +++ b/Mods/ArchipelagoCore.SC2Mod/Base.SC2Data/Lib5BD4895D.galaxy @@ -51,6 +51,7 @@ void lib5BD4895D_InitVariables () { for (init_i = 0; init_i <= 7; init_i += 1) { lib5BD4895D_gv_aP_Core_rainbowColors[init_i] = 1; } + lib5BD4895D_gv_aP_Core_tradeFlavorName = "Void Trade"; lib5BD4895D_gv_aP_Core_objectiveUsedCategories = 4; lib5BD4895D_gv_aP_Core_objectiveDefaultTimer = TimerCreate(); lib5BD4895D_gv_aP_Core_objectivePanel.lv_dialogPanel = c_invalidDialogControlId; @@ -1799,6 +1800,164 @@ void lib5BD4895D_gt_AP_Core_rainbowColorsInit_Init () { TriggerAddEventMapInit(lib5BD4895D_gt_AP_Core_rainbowColorsInit); } +//-------------------------------------------------------------------------------------------------- +// Trigger: AP_Core_tradeStart +//-------------------------------------------------------------------------------------------------- +bool lib5BD4895D_gt_AP_Core_tradeStart_Func (bool testConds, bool runActions) { + // Automatic Variable Declarations + // Conditions + if (testConds) { + if (!((lib5BD4895D_gv_aP_Core_tradeUnit != null))) { + return false; + } + } + + // Actions + if (!runActions) { + return true; + } + + if ((libNtve_gf_TriggeringProgressUnitType() == lib5BD4895D_gv_aP_Core_tradeSendUnitType)) { + if ((UnitGroupCount(UnitCargoGroup(lib5BD4895D_gv_aP_Core_tradeUnit), c_unitCountAlive) == 0)) { + UnitIssueOrder(lib5BD4895D_gv_aP_Core_tradeUnit, Order(AbilityCommand("stop", 0)), c_orderQueueReplace); + } + + } + + return true; +} + +//-------------------------------------------------------------------------------------------------- +void lib5BD4895D_gt_AP_Core_tradeStart_Init () { + lib5BD4895D_gt_AP_Core_tradeStart = TriggerCreate("lib5BD4895D_gt_AP_Core_tradeStart_Func"); + TriggerAddEventUnitTrainProgress(lib5BD4895D_gt_AP_Core_tradeStart, UnitRefFromVariable("lib5BD4895D_gv_aP_Core_tradeUnit"), c_unitProgressStageStart); +} + +//-------------------------------------------------------------------------------------------------- +// Trigger: AP_Core_tradeFail +//-------------------------------------------------------------------------------------------------- +bool lib5BD4895D_gt_AP_Core_tradeFail_Func (bool testConds, bool runActions) { + // Variable Declarations + string lv_message; + + // Automatic Variable Declarations + // Variable Initialization + lv_message = StringSub(EventChatMessage(false), 11, StringLength(EventChatMessage(false))); + + // Actions + if (!runActions) { + return true; + } + + lib5BD4895D_gf_sendchatmessage(EventPlayer(), StringSub(EventChatMessage(false), 11, StringLength(EventChatMessage(false)))); + if ((lib5BD4895D_gv_aP_Core_tradeUnit != null) && (UnitIsAlive(lib5BD4895D_gv_aP_Core_tradeUnit) == true) && (UnitOrder(lib5BD4895D_gv_aP_Core_tradeUnit, 0) != null)) { + UnitIssueOrder(lib5BD4895D_gv_aP_Core_tradeUnit, Order(AbilityCommand("stop", 0)), c_orderQueueReplace); + } + + return true; +} + +//-------------------------------------------------------------------------------------------------- +void lib5BD4895D_gt_AP_Core_tradeFail_Init () { + lib5BD4895D_gt_AP_Core_tradeFail = TriggerCreate("lib5BD4895D_gt_AP_Core_tradeFail_Func"); + TriggerAddEventChatMessage(lib5BD4895D_gt_AP_Core_tradeFail, c_playerAny, "?TradeFail", false); +} + +//-------------------------------------------------------------------------------------------------- +// Trigger: AP_Core_tradeSendSuccess +//-------------------------------------------------------------------------------------------------- +bool lib5BD4895D_gt_AP_Core_tradeSendSuccess_Func (bool testConds, bool runActions) { + // Automatic Variable Declarations + unitgroup autoE5F28EA7_g; + int autoE5F28EA7_u; + unit autoE5F28EA7_var; + + // Actions + if (!runActions) { + return true; + } + + lib5BD4895D_gf_sendchatmessage(EventPlayer(), StringSub(EventChatMessage(false), 14, StringLength(EventChatMessage(false)))); + if ((lib5BD4895D_gv_aP_Core_tradeUnit != null) && (UnitIsAlive(lib5BD4895D_gv_aP_Core_tradeUnit) == true) && (UnitOrder(lib5BD4895D_gv_aP_Core_tradeUnit, 0) != null)) { + autoE5F28EA7_g = UnitCargoGroup(lib5BD4895D_gv_aP_Core_tradeUnit); + autoE5F28EA7_u = UnitGroupCount(autoE5F28EA7_g, c_unitCountAll); + for (;; autoE5F28EA7_u -= 1) { + autoE5F28EA7_var = UnitGroupUnitFromEnd(autoE5F28EA7_g, autoE5F28EA7_u); + if (autoE5F28EA7_var == null) { break; } + UnitRemove(autoE5F28EA7_var); + } + UnitIssueOrder(lib5BD4895D_gv_aP_Core_tradeUnit, Order(AbilityCommand("stop", 0)), c_orderQueueReplace); + } + + return true; +} + +//-------------------------------------------------------------------------------------------------- +void lib5BD4895D_gt_AP_Core_tradeSendSuccess_Init () { + lib5BD4895D_gt_AP_Core_tradeSendSuccess = TriggerCreate("lib5BD4895D_gt_AP_Core_tradeSendSuccess_Func"); + TriggerAddEventChatMessage(lib5BD4895D_gt_AP_Core_tradeSendSuccess, c_playerAny, "?TradeSuccess", false); +} + +//-------------------------------------------------------------------------------------------------- +// Trigger: AP_Core_tradeReceiveSuccess +//-------------------------------------------------------------------------------------------------- +bool lib5BD4895D_gt_AP_Core_tradeReceiveSuccess_Func (bool testConds, bool runActions) { + // Variable Declarations + int lv_refunds; + int lv_word; + string lv_unitType; + int lv_unitCount; + int lv_totalCount; + int lv_mineralCost; + int lv_vespeneCost; + + // Automatic Variable Declarations + // Variable Initialization + lv_refunds = StringToInt(StringWord(EventChatMessage(false), 2)); + lv_word = 3; + lv_mineralCost = UnitTypeGetCost(lib5BD4895D_gv_aP_Core_tradeReceiveUnitType, c_unitCostMinerals); + lv_vespeneCost = UnitTypeGetCost(lib5BD4895D_gv_aP_Core_tradeReceiveUnitType, c_unitCostVespene); + + // Actions + if (!runActions) { + return true; + } + + if ((lib5BD4895D_gv_aP_Core_tradeUnit != null) && (UnitIsAlive(lib5BD4895D_gv_aP_Core_tradeUnit) == true) && (UnitOrder(lib5BD4895D_gv_aP_Core_tradeUnit, 0) != null)) { + UnitIssueOrder(lib5BD4895D_gv_aP_Core_tradeUnit, Order(AbilityCommand("stop", 0)), c_orderQueueReplace); + while ((StringWord(EventChatMessage(false), lv_word) != null)) { + lv_unitType = (StringWord(EventChatMessage(false), lv_word)); + lv_unitCount = StringToInt(StringWord(EventChatMessage(false), (lv_word + 1))); + lv_totalCount = (lv_totalCount + lv_unitCount); + UnitCargoCreate(lib5BD4895D_gv_aP_Core_tradeUnit, lv_unitType, lv_unitCount); + lv_word = (lv_word + 2); + } + PlayerModifyPropertyInt(UnitGetOwner(lib5BD4895D_gv_aP_Core_tradeUnit), c_playerPropMinerals, c_playerPropOperSubtract, (lv_mineralCost * lv_totalCount)); + PlayerModifyPropertyInt(UnitGetOwner(lib5BD4895D_gv_aP_Core_tradeUnit), c_playerPropVespene, c_playerPropOperSubtract, (lv_vespeneCost * lv_totalCount)); + if ((lv_totalCount == 0)) { + lib5BD4895D_gf_sendchatmessage(EventPlayer(), (lib5BD4895D_gv_aP_Core_tradeFlavorName + " failed: No units were found. Trade cost refunded.")); + } + else { + if ((lv_refunds > 0)) { + lib5BD4895D_gf_sendchatmessage(EventPlayer(), (lib5BD4895D_gv_aP_Core_tradeFlavorName + " partially successful: " + IntToString(lv_totalCount) + " units received, " + IntToString(lv_refunds) + " refunded.")); + } + else { + lib5BD4895D_gf_sendchatmessage(EventPlayer(), (lib5BD4895D_gv_aP_Core_tradeFlavorName + " successful: Units received!")); + } + } + } + else { + lib5BD4895D_gf_sendchatmessage(EventPlayer(), (lib5BD4895D_gv_aP_Core_tradeFlavorName + " successful, but the trading structure couldn't be found. The received units are lost to the void...")); + } + return true; +} + +//-------------------------------------------------------------------------------------------------- +void lib5BD4895D_gt_AP_Core_tradeReceiveSuccess_Init () { + lib5BD4895D_gt_AP_Core_tradeReceiveSuccess = TriggerCreate("lib5BD4895D_gt_AP_Core_tradeReceiveSuccess_Func"); + TriggerAddEventChatMessage(lib5BD4895D_gt_AP_Core_tradeReceiveSuccess, c_playerAny, "?Trade ", false); +} + //-------------------------------------------------------------------------------------------------- // Trigger: AP_Core_giveStartingResources //-------------------------------------------------------------------------------------------------- @@ -1998,6 +2157,10 @@ void lib5BD4895D_InitTriggers () { lib5BD4895D_gt_AP_Core_keepControllerAlive_Init(); lib5BD4895D_gt_updatechatbox_Init(); lib5BD4895D_gt_AP_Core_rainbowColorsInit_Init(); + lib5BD4895D_gt_AP_Core_tradeStart_Init(); + lib5BD4895D_gt_AP_Core_tradeFail_Init(); + lib5BD4895D_gt_AP_Core_tradeSendSuccess_Init(); + lib5BD4895D_gt_AP_Core_tradeReceiveSuccess_Init(); lib5BD4895D_gt_AP_Core_giveStartingResources_Init(); lib5BD4895D_gt_AP_Core_setFactionColorHandler_Init(); lib5BD4895D_gt_AP_Triggers_loadFinished_Init(); diff --git a/Mods/ArchipelagoCore.SC2Mod/Base.SC2Data/Lib5BD4895D_h.galaxy b/Mods/ArchipelagoCore.SC2Mod/Base.SC2Data/Lib5BD4895D_h.galaxy index 9ab1c8de4..6b70352c5 100644 --- a/Mods/ArchipelagoCore.SC2Mod/Base.SC2Data/Lib5BD4895D_h.galaxy +++ b/Mods/ArchipelagoCore.SC2Mod/Base.SC2Data/Lib5BD4895D_h.galaxy @@ -93,6 +93,10 @@ int lib5BD4895D_gv_aP_Core_controller2Status; lib5BD4895D_gs_chatbox lib5BD4895D_gv_chatbox; int[8] lib5BD4895D_gv_aP_Core_rainbowColors; bool[21] lib5BD4895D_gv_aP_Core_rainbowKiller; +string lib5BD4895D_gv_aP_Core_tradeFlavorName; +unit lib5BD4895D_gv_aP_Core_tradeUnit; +string lib5BD4895D_gv_aP_Core_tradeSendUnitType; +string lib5BD4895D_gv_aP_Core_tradeReceiveUnitType; int lib5BD4895D_gv_aP_Core_BonusMinerals; int lib5BD4895D_gv_aP_Core_BonusVespene; int lib5BD4895D_gv_aP_Core_objectiveUsedCategories; @@ -164,6 +168,10 @@ trigger lib5BD4895D_gt_AP_Core_dontHideController; trigger lib5BD4895D_gt_AP_Core_keepControllerAlive; trigger lib5BD4895D_gt_updatechatbox; trigger lib5BD4895D_gt_AP_Core_rainbowColorsInit; +trigger lib5BD4895D_gt_AP_Core_tradeStart; +trigger lib5BD4895D_gt_AP_Core_tradeFail; +trigger lib5BD4895D_gt_AP_Core_tradeSendSuccess; +trigger lib5BD4895D_gt_AP_Core_tradeReceiveSuccess; trigger lib5BD4895D_gt_AP_Core_giveStartingResources; trigger lib5BD4895D_gt_AP_Core_setFactionColorHandler; trigger lib5BD4895D_gt_AP_Triggers_loadFinished; diff --git a/Mods/ArchipelagoCore.SC2Mod/DocumentHeader b/Mods/ArchipelagoCore.SC2Mod/DocumentHeader index 5de81d92f..2b4af860a 100644 Binary files a/Mods/ArchipelagoCore.SC2Mod/DocumentHeader and b/Mods/ArchipelagoCore.SC2Mod/DocumentHeader differ diff --git a/Mods/ArchipelagoCore.SC2Mod/Triggers b/Mods/ArchipelagoCore.SC2Mod/Triggers index 382f79c74..29c1a2984 100644 --- a/Mods/ArchipelagoCore.SC2Mod/Triggers +++ b/Mods/ArchipelagoCore.SC2Mod/Triggers @@ -8,6 +8,7 @@ + @@ -4008,6 +4009,1556 @@ + + + + + + + + + + + + + + + + + Flavor name for the trade system used in messages + + + + + + + + + + Void Trade + + + + + The unit that performs the trade + + + + + + + + + + + + + + Dummy unit type for sending, to differentiate sending and receiving + + + + + + + + + + + + + + + Dummy unit type for receiving 1 unit, to calculate trade cost + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Cancel empty sends + + + + + + + + + + + + + + + + + + + + + + + + + stop + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 11 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ?TradeFail + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 11 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + stop + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + + + + + + + + + + + + + + + + + + + + + + + + + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ?TradeSuccess + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 14 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + stop + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + + + + + + + + + + + + + + + + + + + + + + + + + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 2 + + + + + + + + + + 3 + + + + + + + + + + + + + + + + + + + + 0 + + + + + + + + + + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Message format: + ?Trade <refunds> <unit1> <count1> <unit2> <count2>... + + + + + + + + + + + + + + + + + + + ?Trade + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + stop + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + successful, but the trading structure couldn't be found. The received units are lost to the void... + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 2 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Canceling refunds the training cost, so we need to manually reduce player resources + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + successful: Units received! + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + partially successful: + + + + + + + + + + + + + + + + + units received, + + + + + + + + + + + + + + + + + refunded. + + + + + + + + + + + + + + + + + + + + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + failed: No units were found. Trade cost refunded. + + + + + + + + + + + + + + + + + + + + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + + + + + + + + + + + + + + + + + + + + + + + + + 0 + + + + + + + + + + diff --git a/Mods/ArchipelagoCore.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt b/Mods/ArchipelagoCore.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt index bd00b3c4e..b631fce0d 100644 --- a/Mods/ArchipelagoCore.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt +++ b/Mods/ArchipelagoCore.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt @@ -5,15 +5,18 @@ Category/Name/lib_5BD4895D_1FC64FD6=Setters Category/Name/lib_5BD4895D_25EB2476=ArchipelagoStatus Category/Name/lib_5BD4895D_2AD38C27=RainbowColorManager Category/Name/lib_5BD4895D_2E944E7E=BotCommands +Category/Name/lib_5BD4895D_3DAA7149=Variables Category/Name/lib_5BD4895D_480A0D7B=FactionUtil Category/Name/lib_5BD4895D_56C6DC4E=ObjectiveUtil Category/Name/lib_5BD4895D_5B1940FF=triggers Category/Name/lib_5BD4895D_736F700D=MapLoadHelper Category/Name/lib_5BD4895D_74DC05F5=actions Category/Name/lib_5BD4895D_76AA9C78=Factions +Category/Name/lib_5BD4895D_7C761837=Handlers Category/Name/lib_5BD4895D_80F5776F=vars Category/Name/lib_5BD4895D_81E5C31C=Event Category/Name/lib_5BD4895D_85E03602=Variables +Category/Name/lib_5BD4895D_97D75126=Trade Category/Name/lib_5BD4895D_983E707E=Variables Category/Name/lib_5BD4895D_A6ED77DD=ArchipelagoController Category/Name/lib_5BD4895D_BA176EF9=Util @@ -202,13 +205,17 @@ Structure/Name/lib_5BD4895D_EB158E44=AP Objective Trigger/Name/lib_5BD4895D_09118D7A=AP_Core_mapLoadStart Trigger/Name/lib_5BD4895D_17817B71=AP_Core_controllerInit Trigger/Name/lib_5BD4895D_4863529C=AP_Triggers_loadFinished +Trigger/Name/lib_5BD4895D_51223CB4=AP_Core_tradeStart Trigger/Name/lib_5BD4895D_648A0E6A=AP_Core_clearChat Trigger/Name/lib_5BD4895D_7D74620C=AP_Core_objectiveTimerUpdate Trigger/Name/lib_5BD4895D_9016353C=AP_Triggers_uncollectedLocations Trigger/Name/lib_5BD4895D_A7AF36D4=update chatbox +Trigger/Name/lib_5BD4895D_ADD4E109=AP_Core_tradeFail Trigger/Name/lib_5BD4895D_AF628176=AP_Core_keepControllerAlive Trigger/Name/lib_5BD4895D_B8E7CE01=AP_Core_dontHideController +Trigger/Name/lib_5BD4895D_C6CCBDE1=AP_Core_tradeSendSuccess Trigger/Name/lib_5BD4895D_CB983523=AP_Core_mapLoadEnd +Trigger/Name/lib_5BD4895D_D41CD2CB=AP_Core_tradeReceiveSuccess Trigger/Name/lib_5BD4895D_E0A7D8B1=AP_Core_setFactionColorHandler Trigger/Name/lib_5BD4895D_F51822D9=AP_Core_rainbowColorsInit Trigger/Name/lib_5BD4895D_FE6C5704=AP_Core_giveStartingResources @@ -237,6 +244,7 @@ Variable/Name/lib_5BD4895D_1BBB4FF6=AP_Core_locationInit Variable/Name/lib_5BD4895D_1C951515=timer Variable/Name/lib_5BD4895D_1CD736EA=chat label Variable/Name/lib_5BD4895D_1CDEA78A=objective index +Variable/Name/lib_5BD4895D_1E14C21E=unitCount Variable/Name/lib_5BD4895D_1E5BE914=Label Variable/Name/lib_5BD4895D_1E719B54=objective index Variable/Name/lib_5BD4895D_1FEE1ECF=AP_Core_locationCollectable @@ -247,12 +255,14 @@ Variable/Name/lib_5BD4895D_28888CE6=main frame Variable/Name/lib_5BD4895D_29B396A1=location index Variable/Name/lib_5BD4895D_29D70F3C=upgrade100SupplyCount Variable/Name/lib_5BD4895D_2C61B942=index +Variable/Name/lib_5BD4895D_2CA48070=AP_Core_tradeUnit Variable/Name/lib_5BD4895D_2CC5C3EA=timer copy index Variable/Name/lib_5BD4895D_2F3BD71E=label Variable/Name/lib_5BD4895D_2FFAEE02=AP_Core_locations_sent Variable/Name/lib_5BD4895D_30F2A4CA=finished strip Variable/Name/lib_5BD4895D_3168DD46=count Variable/Name/lib_5BD4895D_33276991=has timer +Variable/Name/lib_5BD4895D_33289DB2=unitType Variable/Name/lib_5BD4895D_35877E75=visual index Variable/Name/lib_5BD4895D_361DCA91=counter text Variable/Name/lib_5BD4895D_376CFBCD=Objective @@ -273,12 +283,14 @@ Variable/Name/lib_5BD4895D_46B093EA=category index Variable/Name/lib_5BD4895D_470AA1C8=rolling index Variable/Name/lib_5BD4895D_47322150=AP_Core_Faction_PRIMAL_ZERG Variable/Name/lib_5BD4895D_4963C962=objective index +Variable/Name/lib_5BD4895D_49CB76EF=totalCount Variable/Name/lib_5BD4895D_4EA4ACFD=currentUnit Variable/Name/lib_5BD4895D_4FAF2793=AP_Core_chatbox_offsetY Variable/Name/lib_5BD4895D_523B020E=location index Variable/Name/lib_5BD4895D_532D0706=color Variable/Name/lib_5BD4895D_54145667=objective count Variable/Name/lib_5BD4895D_54EDC48F=Category +Variable/Name/lib_5BD4895D_561F711C=message Variable/Name/lib_5BD4895D_568E08CE=color Variable/Name/lib_5BD4895D_56C8A09F=faction Variable/Name/lib_5BD4895D_58035D35=AP_Core_objectiveUsedCategories @@ -297,6 +309,7 @@ Variable/Name/lib_5BD4895D_68E464DE=extra lines Variable/Name/lib_5BD4895D_696D7EC0=value Variable/Name/lib_5BD4895D_69AA996C=CounterMax Variable/Name/lib_5BD4895D_6C88573E=category index +Variable/Name/lib_5BD4895D_6C90BDB7=AP_Core_tradeReceiveUnitType Variable/Name/lib_5BD4895D_6E2B5149=category index Variable/Name/lib_5BD4895D_6E72D461=AP_Core_BonusMinerals Variable/Name/lib_5BD4895D_6E945090=colorIndex @@ -354,6 +367,8 @@ Variable/Name/lib_5BD4895D_B4D40DF3=visual rolling index Variable/Name/lib_5BD4895D_B66911A5=AP_Core_blackScreen Variable/Name/lib_5BD4895D_B7A41851=currentPlayer Variable/Name/lib_5BD4895D_B7A49EF1=timer index +Variable/Name/lib_5BD4895D_B85076EC=word +Variable/Name/lib_5BD4895D_B91B0753=AP_Core_tradeSendUnitType Variable/Name/lib_5BD4895D_B9605059=Name Variable/Name/lib_5BD4895D_BB563F83=timer rolling index Variable/Name/lib_5BD4895D_BDB6AADE=AP_Core_controller @@ -367,6 +382,7 @@ Variable/Name/lib_5BD4895D_CB377F39=Has Timer Variable/Name/lib_5BD4895D_CBC3AF45=objective index Variable/Name/lib_5BD4895D_CC25FB18=AP_Core_primalZergColor Variable/Name/lib_5BD4895D_CF227E57=currentPlayer +Variable/Name/lib_5BD4895D_CFF1F80D=refunds Variable/Name/lib_5BD4895D_D1226431=btn x offset Variable/Name/lib_5BD4895D_D12D8261=objective index Variable/Name/lib_5BD4895D_D3B2C226=finished @@ -382,7 +398,10 @@ Variable/Name/lib_5BD4895D_DF417F0C=objective index Variable/Name/lib_5BD4895D_E318F8D4=category index Variable/Name/lib_5BD4895D_E6F9B53D=category index Variable/Name/lib_5BD4895D_E884AC56=max messages +Variable/Name/lib_5BD4895D_E8D31FC0=mineralCost +Variable/Name/lib_5BD4895D_E95FD62D=AP_Core_tradeFlavorName Variable/Name/lib_5BD4895D_EA65AB89=AP_Core_rainbowKiller +Variable/Name/lib_5BD4895D_ECA6224E=vespeneCost Variable/Name/lib_5BD4895D_ECEA655E=counter suffix Variable/Name/lib_5BD4895D_ED587702=counter suffix Variable/Name/lib_5BD4895D_EDE1A068=AP_Core_chatboxAnchor diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml index 93d4fbd4d..9c4540a80 100644 --- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml +++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml @@ -195,6 +195,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +