From 9587e4fcf0ea6594391508a3789fbcc82ef6b5db Mon Sep 17 00:00:00 2001 From: Wanne Date: Thu, 11 Apr 2013 19:18:19 +0000 Subject: [PATCH] - Fixed and reworked LUA scripts (by Jazz) o Updated LUA documentation (moved to new server): http://legion.itzg.pl/mzgb/pmwiki/pmwiki.php?n=JaggedAlliance2UBV1.Jav113lua git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1645 4f8fa57e-7814-0410-bad4-adc449f26b7c --- gamedir/Data-1.13/Scripts/GameInit.lua | 56 +++++++++---------- .../Scripts/StrategicTownLoyalty.lua | 11 +--- gamedir/Data/Scripts/GameInit.lua | 56 +++++++++---------- gamedir/Data/Scripts/StrategicTownLoyalty.lua | 11 +--- 4 files changed, 60 insertions(+), 74 deletions(-) diff --git a/gamedir/Data-1.13/Scripts/GameInit.lua b/gamedir/Data-1.13/Scripts/GameInit.lua index dcf673afc..4782ab426 100644 --- a/gamedir/Data-1.13/Scripts/GameInit.lua +++ b/gamedir/Data-1.13/Scripts/GameInit.lua @@ -1,5 +1,5 @@ --[[ -http://www.legion.zone.zg.pl/doku.php/modowanie/ja/art_ja_m_22_lua +http://legion.itzg.pl/mzgb/pmwiki/pmwiki.php?n=JaggedAlliance2UBV1.Jav113lua ********************** ** Global variables ** @@ -292,33 +292,33 @@ Fincances = ANONYMOUS_DEPOSIT = 1, TRANSACTION_FEE = 2, HIRED_MERC = 3, - BOBBYR_PURCHASE, - PAY_SPECK_FOR_MERC = 4, - MEDICAL_DEPOSIT = 5, - IMP_PROFILE = 6, - PURCHASED_INSURANCE = 7, - REDUCED_INSURANCE = 8, - EXTENDED_INSURANCE = 9, - CANCELLED_INSURANCE = 10, - INSURANCE_PAYOUT = 11, - EXTENDED_CONTRACT_BY_1_DAY = 12, - EXTENDED_CONTRACT_BY_1_WEEK = 13, - EXTENDED_CONTRACT_BY_2_WEEKS = 14, - DEPOSIT_FROM_GOLD_MINE = 15, - DEPOSIT_FROM_SILVER_MINE = 16, - PURCHASED_FLOWERS = 17, - FULL_MEDICAL_REFUND = 18, - PARTIAL_MEDICAL_REFUND = 19, - NO_MEDICAL_REFUND = 20, - PAYMENT_TO_NPC = 21, - TRANSFER_FUNDS_TO_MERC = 22, - TRANSFER_FUNDS_FROM_MERC = 23, - TRAIN_TOWN_MILITIA = 24, - PURCHASED_ITEM_FROM_DEALER = 25, - MERC_DEPOSITED_MONEY_TO_PLAYER_ACCOUNT = 26, - SOLD_ITEMS = 27, - FACILITY_OPERATIONS = 28, - MILITIA_UPKEEP = 29, + BOBBYR_PURCHASE = 4, + PAY_SPECK_FOR_MERC = 5, + MEDICAL_DEPOSIT = 6, + IMP_PROFILE = 7, + PURCHASED_INSURANCE = 8, + REDUCED_INSURANCE = 9, + EXTENDED_INSURANCE = 10, + CANCELLED_INSURANCE = 11, + INSURANCE_PAYOUT = 12, + EXTENDED_CONTRACT_BY_1_DAY = 13, + EXTENDED_CONTRACT_BY_1_WEEK = 14, + EXTENDED_CONTRACT_BY_2_WEEKS = 15, + DEPOSIT_FROM_GOLD_MINE = 16, + DEPOSIT_FROM_SILVER_MINE = 17, + PURCHASED_FLOWERS = 18, + FULL_MEDICAL_REFUND = 19, + PARTIAL_MEDICAL_REFUND = 20, + NO_MEDICAL_REFUND = 21, + PAYMENT_TO_NPC = 22, + TRANSFER_FUNDS_TO_MERC = 23, + TRANSFER_FUNDS_FROM_MERC = 24, + TRAIN_TOWN_MILITIA = 25, + PURCHASED_ITEM_FROM_DEALER = 26, + MERC_DEPOSITED_MONEY_TO_PLAYER_ACCOUNT = 27, + SOLD_ITEMS = 28, + FACILITY_OPERATIONS = 29, + MILITIA_UPKEEP = 30, } Sender = diff --git a/gamedir/Data-1.13/Scripts/StrategicTownLoyalty.lua b/gamedir/Data-1.13/Scripts/StrategicTownLoyalty.lua index dbb03459c..7e3b30f2d 100644 --- a/gamedir/Data-1.13/Scripts/StrategicTownLoyalty.lua +++ b/gamedir/Data-1.13/Scripts/StrategicTownLoyalty.lua @@ -1,6 +1,6 @@ --[[ - http://www.legion.zone.zg.pl/doku.php/modowanie/ja/art_ja_m_22_lua + http://legion.itzg.pl/mzgb/pmwiki/pmwiki.php?n=JaggedAlliance2UBV1.Jav113lua ********************** ** Global variables ** @@ -163,7 +163,7 @@ EventGlobal = GLOBAL_LOYALTY_GAIN_SAM = 10, GLOBAL_LOYALTY_LOSE_SAM = 11, GLOBAL_LOYALTY_QUEEN_BATTLE_WON = 12, - GLOBAL_LOYALTY_GRIZZLY_DEAD = 13, + GLOBAL_LOYALTY_UNUSED = 13, GLOBAL_LOYALTY_PRISONERS_TORTURED = 14, } @@ -282,13 +282,6 @@ function HandleGlobalLoyaltyEvent( ubEventType, sSectorX, sSectorY, bSectorZ ) iLoyaltyChange = -250 AffectAllTownsLoyaltyByDistanceFrom( iLoyaltyChange, sSectorX, sSectorY, bSectorZ ) - elseif ubEventType == EventGlobal.GLOBAL_LOYALTY_GRIZZLY_DEAD then - - if ( CheckMercIsDead(3) == false ) then - iLoyaltyChange = 1000 - AffectAllTownsLoyaltyByDistanceFrom( iLoyaltyChange, sSectorX, sSectorY, bSectorZ ) - end - elseif ubEventType == EventGlobal.GLOBAL_LOYALTY_PRISONERS_TORTURED then iLoyaltyChange = -60 diff --git a/gamedir/Data/Scripts/GameInit.lua b/gamedir/Data/Scripts/GameInit.lua index dcf673afc..4782ab426 100644 --- a/gamedir/Data/Scripts/GameInit.lua +++ b/gamedir/Data/Scripts/GameInit.lua @@ -1,5 +1,5 @@ --[[ -http://www.legion.zone.zg.pl/doku.php/modowanie/ja/art_ja_m_22_lua +http://legion.itzg.pl/mzgb/pmwiki/pmwiki.php?n=JaggedAlliance2UBV1.Jav113lua ********************** ** Global variables ** @@ -292,33 +292,33 @@ Fincances = ANONYMOUS_DEPOSIT = 1, TRANSACTION_FEE = 2, HIRED_MERC = 3, - BOBBYR_PURCHASE, - PAY_SPECK_FOR_MERC = 4, - MEDICAL_DEPOSIT = 5, - IMP_PROFILE = 6, - PURCHASED_INSURANCE = 7, - REDUCED_INSURANCE = 8, - EXTENDED_INSURANCE = 9, - CANCELLED_INSURANCE = 10, - INSURANCE_PAYOUT = 11, - EXTENDED_CONTRACT_BY_1_DAY = 12, - EXTENDED_CONTRACT_BY_1_WEEK = 13, - EXTENDED_CONTRACT_BY_2_WEEKS = 14, - DEPOSIT_FROM_GOLD_MINE = 15, - DEPOSIT_FROM_SILVER_MINE = 16, - PURCHASED_FLOWERS = 17, - FULL_MEDICAL_REFUND = 18, - PARTIAL_MEDICAL_REFUND = 19, - NO_MEDICAL_REFUND = 20, - PAYMENT_TO_NPC = 21, - TRANSFER_FUNDS_TO_MERC = 22, - TRANSFER_FUNDS_FROM_MERC = 23, - TRAIN_TOWN_MILITIA = 24, - PURCHASED_ITEM_FROM_DEALER = 25, - MERC_DEPOSITED_MONEY_TO_PLAYER_ACCOUNT = 26, - SOLD_ITEMS = 27, - FACILITY_OPERATIONS = 28, - MILITIA_UPKEEP = 29, + BOBBYR_PURCHASE = 4, + PAY_SPECK_FOR_MERC = 5, + MEDICAL_DEPOSIT = 6, + IMP_PROFILE = 7, + PURCHASED_INSURANCE = 8, + REDUCED_INSURANCE = 9, + EXTENDED_INSURANCE = 10, + CANCELLED_INSURANCE = 11, + INSURANCE_PAYOUT = 12, + EXTENDED_CONTRACT_BY_1_DAY = 13, + EXTENDED_CONTRACT_BY_1_WEEK = 14, + EXTENDED_CONTRACT_BY_2_WEEKS = 15, + DEPOSIT_FROM_GOLD_MINE = 16, + DEPOSIT_FROM_SILVER_MINE = 17, + PURCHASED_FLOWERS = 18, + FULL_MEDICAL_REFUND = 19, + PARTIAL_MEDICAL_REFUND = 20, + NO_MEDICAL_REFUND = 21, + PAYMENT_TO_NPC = 22, + TRANSFER_FUNDS_TO_MERC = 23, + TRANSFER_FUNDS_FROM_MERC = 24, + TRAIN_TOWN_MILITIA = 25, + PURCHASED_ITEM_FROM_DEALER = 26, + MERC_DEPOSITED_MONEY_TO_PLAYER_ACCOUNT = 27, + SOLD_ITEMS = 28, + FACILITY_OPERATIONS = 29, + MILITIA_UPKEEP = 30, } Sender = diff --git a/gamedir/Data/Scripts/StrategicTownLoyalty.lua b/gamedir/Data/Scripts/StrategicTownLoyalty.lua index 49fc483b5..f80ab2ba0 100644 --- a/gamedir/Data/Scripts/StrategicTownLoyalty.lua +++ b/gamedir/Data/Scripts/StrategicTownLoyalty.lua @@ -1,6 +1,6 @@ --[[ - http://www.legion.zone.zg.pl/doku.php/modowanie/ja/art_ja_m_22_lua + http://legion.itzg.pl/mzgb/pmwiki/pmwiki.php?n=JaggedAlliance2UBV1.Jav113lua ********************** ** Global variables ** @@ -163,7 +163,7 @@ EventGlobal = GLOBAL_LOYALTY_GAIN_SAM = 10, GLOBAL_LOYALTY_LOSE_SAM = 11, GLOBAL_LOYALTY_QUEEN_BATTLE_WON = 12, - GLOBAL_LOYALTY_GRIZZLY_DEAD = 13, + GLOBAL_LOYALTY_UNUSED = 13, } @@ -281,13 +281,6 @@ function HandleGlobalLoyaltyEvent( ubEventType, sSectorX, sSectorY, bSectorZ ) iLoyaltyChange = -250 AffectAllTownsLoyaltyByDistanceFrom( iLoyaltyChange, sSectorX, sSectorY, bSectorZ ) - elseif ubEventType == EventGlobal.GLOBAL_LOYALTY_GRIZZLY_DEAD then - - if ( CheckMercIsDead(3) == false ) then - iLoyaltyChange = 1000 - AffectAllTownsLoyaltyByDistanceFrom( iLoyaltyChange, sSectorX, sSectorY, bSectorZ ) - end - end end