1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-08-26 14:30:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

- Fixed and reworked LUA scripts (by Jazz)

Browse Source 
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
This commit is contained in:
Wanne
2013-04-11 19:18:19 +00:00
parent 90005cd800
commit 9587e4fcf0
4 changed files with 60 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gamedir/Data-1.13/Scripts/GameInit.lua
+28 -28
View File
@@ -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 ** ** Global variables **
@@ -292,33 +292,33 @@ Fincances =
ANONYMOUS_DEPOSIT = 1, ANONYMOUS_DEPOSIT = 1,
TRANSACTION_FEE = 2, TRANSACTION_FEE = 2,
HIRED_MERC = 3, HIRED_MERC = 3,
BOBBYR_PURCHASE, BOBBYR_PURCHASE = 4,
PAY_SPECK_FOR_MERC = 4, PAY_SPECK_FOR_MERC = 5,
MEDICAL_DEPOSIT = 5, MEDICAL_DEPOSIT = 6,
IMP_PROFILE = 6, IMP_PROFILE = 7,
PURCHASED_INSURANCE = 7, PURCHASED_INSURANCE = 8,
REDUCED_INSURANCE = 8, REDUCED_INSURANCE = 9,
EXTENDED_INSURANCE = 9, EXTENDED_INSURANCE = 10,
CANCELLED_INSURANCE = 10, CANCELLED_INSURANCE = 11,
INSURANCE_PAYOUT = 11, INSURANCE_PAYOUT = 12,
EXTENDED_CONTRACT_BY_1_DAY = 12, EXTENDED_CONTRACT_BY_1_DAY = 13,
EXTENDED_CONTRACT_BY_1_WEEK = 13, EXTENDED_CONTRACT_BY_1_WEEK = 14,
EXTENDED_CONTRACT_BY_2_WEEKS = 14, EXTENDED_CONTRACT_BY_2_WEEKS = 15,
DEPOSIT_FROM_GOLD_MINE = 15, DEPOSIT_FROM_GOLD_MINE = 16,
DEPOSIT_FROM_SILVER_MINE = 16, DEPOSIT_FROM_SILVER_MINE = 17,
PURCHASED_FLOWERS = 17, PURCHASED_FLOWERS = 18,
FULL_MEDICAL_REFUND = 18, FULL_MEDICAL_REFUND = 19,
PARTIAL_MEDICAL_REFUND = 19, PARTIAL_MEDICAL_REFUND = 20,
NO_MEDICAL_REFUND = 20, NO_MEDICAL_REFUND = 21,
PAYMENT_TO_NPC = 21, PAYMENT_TO_NPC = 22,
TRANSFER_FUNDS_TO_MERC = 22, TRANSFER_FUNDS_TO_MERC = 23,
TRANSFER_FUNDS_FROM_MERC = 23, TRANSFER_FUNDS_FROM_MERC = 24,
TRAIN_TOWN_MILITIA = 24, TRAIN_TOWN_MILITIA = 25,
PURCHASED_ITEM_FROM_DEALER = 25, PURCHASED_ITEM_FROM_DEALER = 26,
MERC_DEPOSITED_MONEY_TO_PLAYER_ACCOUNT = 26, MERC_DEPOSITED_MONEY_TO_PLAYER_ACCOUNT = 27,
SOLD_ITEMS = 27, SOLD_ITEMS = 28,
FACILITY_OPERATIONS = 28, FACILITY_OPERATIONS = 29,
MILITIA_UPKEEP = 29, MILITIA_UPKEEP = 30,
} }
Sender = Sender =
gamedir/Data-1.13/Scripts/StrategicTownLoyalty.lua
+2 -9
View File
@@ -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 ** ** Global variables **
@@ -163,7 +163,7 @@ EventGlobal =
GLOBAL_LOYALTY_GAIN_SAM = 10, GLOBAL_LOYALTY_GAIN_SAM = 10,
GLOBAL_LOYALTY_LOSE_SAM = 11, GLOBAL_LOYALTY_LOSE_SAM = 11,
GLOBAL_LOYALTY_QUEEN_BATTLE_WON = 12, GLOBAL_LOYALTY_QUEEN_BATTLE_WON = 12,
GLOBAL_LOYALTY_GRIZZLY_DEAD = 13, GLOBAL_LOYALTY_UNUSED = 13,
GLOBAL_LOYALTY_PRISONERS_TORTURED = 14, GLOBAL_LOYALTY_PRISONERS_TORTURED = 14,
} }
@@ -282,13 +282,6 @@ function HandleGlobalLoyaltyEvent( ubEventType, sSectorX, sSectorY, bSectorZ )
iLoyaltyChange = -250 iLoyaltyChange = -250
AffectAllTownsLoyaltyByDistanceFrom( iLoyaltyChange, sSectorX, sSectorY, bSectorZ ) 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 elseif ubEventType == EventGlobal.GLOBAL_LOYALTY_PRISONERS_TORTURED then
iLoyaltyChange = -60 iLoyaltyChange = -60
gamedir/Data/Scripts/GameInit.lua
+28 -28
View File
@@ -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 ** ** Global variables **
@@ -292,33 +292,33 @@ Fincances =
ANONYMOUS_DEPOSIT = 1, ANONYMOUS_DEPOSIT = 1,
TRANSACTION_FEE = 2, TRANSACTION_FEE = 2,
HIRED_MERC = 3, HIRED_MERC = 3,
BOBBYR_PURCHASE, BOBBYR_PURCHASE = 4,
PAY_SPECK_FOR_MERC = 4, PAY_SPECK_FOR_MERC = 5,
MEDICAL_DEPOSIT = 5, MEDICAL_DEPOSIT = 6,
IMP_PROFILE = 6, IMP_PROFILE = 7,
PURCHASED_INSURANCE = 7, PURCHASED_INSURANCE = 8,
REDUCED_INSURANCE = 8, REDUCED_INSURANCE = 9,
EXTENDED_INSURANCE = 9, EXTENDED_INSURANCE = 10,
CANCELLED_INSURANCE = 10, CANCELLED_INSURANCE = 11,
INSURANCE_PAYOUT = 11, INSURANCE_PAYOUT = 12,
EXTENDED_CONTRACT_BY_1_DAY = 12, EXTENDED_CONTRACT_BY_1_DAY = 13,
EXTENDED_CONTRACT_BY_1_WEEK = 13, EXTENDED_CONTRACT_BY_1_WEEK = 14,
EXTENDED_CONTRACT_BY_2_WEEKS = 14, EXTENDED_CONTRACT_BY_2_WEEKS = 15,
DEPOSIT_FROM_GOLD_MINE = 15, DEPOSIT_FROM_GOLD_MINE = 16,
DEPOSIT_FROM_SILVER_MINE = 16, DEPOSIT_FROM_SILVER_MINE = 17,
PURCHASED_FLOWERS = 17, PURCHASED_FLOWERS = 18,
FULL_MEDICAL_REFUND = 18, FULL_MEDICAL_REFUND = 19,
PARTIAL_MEDICAL_REFUND = 19, PARTIAL_MEDICAL_REFUND = 20,
NO_MEDICAL_REFUND = 20, NO_MEDICAL_REFUND = 21,
PAYMENT_TO_NPC = 21, PAYMENT_TO_NPC = 22,
TRANSFER_FUNDS_TO_MERC = 22, TRANSFER_FUNDS_TO_MERC = 23,
TRANSFER_FUNDS_FROM_MERC = 23, TRANSFER_FUNDS_FROM_MERC = 24,
TRAIN_TOWN_MILITIA = 24, TRAIN_TOWN_MILITIA = 25,
PURCHASED_ITEM_FROM_DEALER = 25, PURCHASED_ITEM_FROM_DEALER = 26,
MERC_DEPOSITED_MONEY_TO_PLAYER_ACCOUNT = 26, MERC_DEPOSITED_MONEY_TO_PLAYER_ACCOUNT = 27,
SOLD_ITEMS = 27, SOLD_ITEMS = 28,
FACILITY_OPERATIONS = 28, FACILITY_OPERATIONS = 29,
MILITIA_UPKEEP = 29, MILITIA_UPKEEP = 30,
} }
Sender = Sender =
gamedir/Data/Scripts/StrategicTownLoyalty.lua
+2 -9
View File
@@ -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 ** ** Global variables **
@@ -163,7 +163,7 @@ EventGlobal =
GLOBAL_LOYALTY_GAIN_SAM = 10, GLOBAL_LOYALTY_GAIN_SAM = 10,
GLOBAL_LOYALTY_LOSE_SAM = 11, GLOBAL_LOYALTY_LOSE_SAM = 11,
GLOBAL_LOYALTY_QUEEN_BATTLE_WON = 12, 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 iLoyaltyChange = -250
AffectAllTownsLoyaltyByDistanceFrom( iLoyaltyChange, sSectorX, sSectorY, bSectorZ ) 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
end end