From 5e2088ddd4051235463e5fc89377942f5fab93b4 Mon Sep 17 00:00:00 2001 From: Wanne Date: Sat, 14 Apr 2012 13:05:10 +0000 Subject: [PATCH] - Bugfix ActionItems.xml (by Jazz) o Fixed wrong item indexes for o Removed UB specific LUA code from the ExplosionControl.lua (Data and Data-1.13) git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1406 4f8fa57e-7814-0410-bad4-adc449f26b7c --- .../Data-1.13/Scripts/ExplosionControl.lua | 60 ---------- .../TableData/MapAction/ActionItems.xml | 82 ++++++-------- .../TableData/MapAction/ActionItems.xml | 106 +++++++++++------- gamedir/Data/Scripts/ExplosionControl.lua | 60 ---------- .../Data/TableData/MapAction/ActionItems.xml | 82 ++++++-------- 5 files changed, 129 insertions(+), 261 deletions(-) diff --git a/gamedir/Data-1.13/Scripts/ExplosionControl.lua b/gamedir/Data-1.13/Scripts/ExplosionControl.lua index 132dfb9bc..82b7af6d0 100644 --- a/gamedir/Data-1.13/Scripts/ExplosionControl.lua +++ b/gamedir/Data-1.13/Scripts/ExplosionControl.lua @@ -318,64 +318,4 @@ if ActionID == 24 then end end --- UB Action - --- BIGGENS BOMBS -if ActionID == 25 then - - if ( ShouldThePlayerStopWhenWalkingOnBiggensActionItem( 17 ) == true ) then - - HavePersonAtGridnoStop( sGridNo ) - - -- Make Biggens run for cover and then detonate the explosives - TriggerNPCRecord( Profil.BIGGENS , 17 ) - - end - -end - --- BIGGENS WARNING -if ActionID == 26 then - - if ( ShouldThePlayerStopWhenWalkingOnBiggensActionItem( 16 ) == true ) then - - HavePersonAtGridnoStop( sGridNo ) - - -- Make Biggens run for cover and then detonate the explosives - TriggerNPCRecord( Profil.BIGGENS , 16 ) - - end - -end - --- SEE FORTIFIED DOOR -if ActionID == 27 then - - HandleSeeingFortifiedDoor( sGridNo ) - -end - --- OPEN FORTIFED DOOR -if ActionID == 28 then - - HandleSwitchToOpenFortifiedDoor( sGridNo ) - -end - --- SEE POWER GEN FAN -if ActionID == 29 then - - -- if the player is in the power plant - if( gWorldSectorX == 13 and gWorldSectorY == 10 and gbWorldSectorZ == 0 ) then - - HandleSeeingPowerGenFan( sGridNo ) - - elseif( gWorldSectorX == 15 and gWorldSectorY == 12 and gbWorldSectorZ == 3 ) then - - -- The player is hitting the switch to launch the missles - HandlePlayerHittingSwitchToLaunchMissles() - end - -end - end diff --git a/gamedir/Data-1.13/TableData/MapAction/ActionItems.xml b/gamedir/Data-1.13/TableData/MapAction/ActionItems.xml index 1b3559587..184dc4817 100644 --- a/gamedir/Data-1.13/TableData/MapAction/ActionItems.xml +++ b/gamedir/Data-1.13/TableData/MapAction/ActionItems.xml @@ -44,36 +44,17 @@ ActionID: BombItem: Name uiIndex (items.xml) - STUN_GRENADE - 241 - TEARGAS_GRENADE - 242 - MUSTARD_GRENADE - 243 - MINI_GRENADE - 244 - HAND_GRENADE - 245 - RDX - 246 - TNT - 247 - HMX - 248 - C1 - 249 - MORTAR_SHELL - 250 - MINE - 251 - C4 - 252 + STUN_GRENADE - 131 + TEARGAS_GRENADE - 132 + MUSTARD_GRENADE - 133 + MINI_GRENADE - 134 + HAND_GRENADE - 135 + TNT - 137 + MINE - 141 + C4 - 142 TRIP_FLARE - 143 TRIP_KLAXON - 144 - SHAPED_CHARGE - 255 - BREAK_LIGHT - 256 - GL_HE_GRENADE - 257 - GL_TEARGAS_GRENADE - 258 - GL_STUN_GRENADE - 259 - GL_SMOKE_GRENADE - 260 - SMOKE_GRENADE - 261 - TANK_SHELL - 262 - STRUCTURE_IGNITE - 263 - CREATURE_COCKTAIL - 264 - STRUCTURE_EXPLOSION - 265 - GREAT_BIG_EXPLOSION - 266 - BIG_TEAR_GAS - 267 - SMALL_CREATURE_GAS - 268 - LARGE_CREATURE_GAS - 269 - VERY_SMALL_CREATURE_GAS - 270 + SMOKE_GRENADE - 151 Blow_up: Set to 1 if it should trigger an explosion, otherwise 0 @@ -104,35 +85,35 @@ BombItem: Teargas Explosion 3 1 - 242 + 132 3 Stun Explosion 3 1 - 241 + 131 4 Smoke Explosion 3 1 - 261 + 151 5 Mustard Gas 3 1 - 243 + 133 6 Land Mine 3 1 - 251 + 141 7 @@ -163,18 +144,21 @@ BombItem: Small Explosion 3 1 + 135 12 Medium Explosion 3 1 + 137 13 Large Explosion 3 1 + 142 14 @@ -297,38 +281,36 @@ BombItem: 1 267 - 34 - BIGGENS BOMBS - 25 - 0 + Empty action + 0 + 0 35 - BIGGENS WARNING - 26 - 0 + Empty action + 0 + 0 36 - SEE FORTIFIED DOOR - 27 - 0 + Empty action + 0 + 0 37 - OPEN FORTIFED DOOR - 28 - 0 + Empty action + 0 + 0 38 - SEE POWER GEN FAN - 29 - 0 + Empty action + 0 + 0 - 38 Empty action diff --git a/gamedir/Data-UB/Data-Files/TableData/MapAction/ActionItems.xml b/gamedir/Data-UB/Data-Files/TableData/MapAction/ActionItems.xml index a7aab4acc..8979fec3d 100644 --- a/gamedir/Data-UB/Data-Files/TableData/MapAction/ActionItems.xml +++ b/gamedir/Data-UB/Data-Files/TableData/MapAction/ActionItems.xml @@ -2,48 +2,69 @@ + 0 @@ -64,35 +85,35 @@ BombItem : Teargas Explosion 3 1 - 242 + 132 3 Stun Explosion 3 1 - 241 + 131 4 Smoke Explosion 3 1 - 261 + 151 5 Mustard Gas 3 1 - 243 + 133 6 Land Mine 3 1 - 251 + 141 7 @@ -123,18 +144,21 @@ BombItem : Small Explosion 3 1 + 135 12 Medium Explosion 3 1 + 137 13 Large Explosion 3 1 + 142 14 diff --git a/gamedir/Data/Scripts/ExplosionControl.lua b/gamedir/Data/Scripts/ExplosionControl.lua index 132dfb9bc..82b7af6d0 100644 --- a/gamedir/Data/Scripts/ExplosionControl.lua +++ b/gamedir/Data/Scripts/ExplosionControl.lua @@ -318,64 +318,4 @@ if ActionID == 24 then end end --- UB Action - --- BIGGENS BOMBS -if ActionID == 25 then - - if ( ShouldThePlayerStopWhenWalkingOnBiggensActionItem( 17 ) == true ) then - - HavePersonAtGridnoStop( sGridNo ) - - -- Make Biggens run for cover and then detonate the explosives - TriggerNPCRecord( Profil.BIGGENS , 17 ) - - end - -end - --- BIGGENS WARNING -if ActionID == 26 then - - if ( ShouldThePlayerStopWhenWalkingOnBiggensActionItem( 16 ) == true ) then - - HavePersonAtGridnoStop( sGridNo ) - - -- Make Biggens run for cover and then detonate the explosives - TriggerNPCRecord( Profil.BIGGENS , 16 ) - - end - -end - --- SEE FORTIFIED DOOR -if ActionID == 27 then - - HandleSeeingFortifiedDoor( sGridNo ) - -end - --- OPEN FORTIFED DOOR -if ActionID == 28 then - - HandleSwitchToOpenFortifiedDoor( sGridNo ) - -end - --- SEE POWER GEN FAN -if ActionID == 29 then - - -- if the player is in the power plant - if( gWorldSectorX == 13 and gWorldSectorY == 10 and gbWorldSectorZ == 0 ) then - - HandleSeeingPowerGenFan( sGridNo ) - - elseif( gWorldSectorX == 15 and gWorldSectorY == 12 and gbWorldSectorZ == 3 ) then - - -- The player is hitting the switch to launch the missles - HandlePlayerHittingSwitchToLaunchMissles() - end - -end - end diff --git a/gamedir/Data/TableData/MapAction/ActionItems.xml b/gamedir/Data/TableData/MapAction/ActionItems.xml index 1b3559587..184dc4817 100644 --- a/gamedir/Data/TableData/MapAction/ActionItems.xml +++ b/gamedir/Data/TableData/MapAction/ActionItems.xml @@ -44,36 +44,17 @@ ActionID: BombItem: Name uiIndex (items.xml) - STUN_GRENADE - 241 - TEARGAS_GRENADE - 242 - MUSTARD_GRENADE - 243 - MINI_GRENADE - 244 - HAND_GRENADE - 245 - RDX - 246 - TNT - 247 - HMX - 248 - C1 - 249 - MORTAR_SHELL - 250 - MINE - 251 - C4 - 252 + STUN_GRENADE - 131 + TEARGAS_GRENADE - 132 + MUSTARD_GRENADE - 133 + MINI_GRENADE - 134 + HAND_GRENADE - 135 + TNT - 137 + MINE - 141 + C4 - 142 TRIP_FLARE - 143 TRIP_KLAXON - 144 - SHAPED_CHARGE - 255 - BREAK_LIGHT - 256 - GL_HE_GRENADE - 257 - GL_TEARGAS_GRENADE - 258 - GL_STUN_GRENADE - 259 - GL_SMOKE_GRENADE - 260 - SMOKE_GRENADE - 261 - TANK_SHELL - 262 - STRUCTURE_IGNITE - 263 - CREATURE_COCKTAIL - 264 - STRUCTURE_EXPLOSION - 265 - GREAT_BIG_EXPLOSION - 266 - BIG_TEAR_GAS - 267 - SMALL_CREATURE_GAS - 268 - LARGE_CREATURE_GAS - 269 - VERY_SMALL_CREATURE_GAS - 270 + SMOKE_GRENADE - 151 Blow_up: Set to 1 if it should trigger an explosion, otherwise 0 @@ -104,35 +85,35 @@ BombItem: Teargas Explosion 3 1 - 242 + 132 3 Stun Explosion 3 1 - 241 + 131 4 Smoke Explosion 3 1 - 261 + 151 5 Mustard Gas 3 1 - 243 + 133 6 Land Mine 3 1 - 251 + 141 7 @@ -163,18 +144,21 @@ BombItem: Small Explosion 3 1 + 135 12 Medium Explosion 3 1 + 137 13 Large Explosion 3 1 + 142 14 @@ -297,38 +281,36 @@ BombItem: 1 267 - 34 - BIGGENS BOMBS - 25 - 0 + Empty action + 0 + 0 35 - BIGGENS WARNING - 26 - 0 + Empty action + 0 + 0 36 - SEE FORTIFIED DOOR - 27 - 0 + Empty action + 0 + 0 37 - OPEN FORTIFED DOOR - 28 - 0 + Empty action + 0 + 0 38 - SEE POWER GEN FAN - 29 - 0 + Empty action + 0 + 0 - 38 Empty action