From 78498591ac62e13a60f5eb5b09903c258f7c1bed Mon Sep 17 00:00:00 2001 From: Harry Young Date: Sat, 10 Nov 2012 10:45:48 +0100 Subject: [PATCH] finished work on Borg-MMBRefit (had I known only the vinculum was left, lol ^^) commented old code on borg4-6 Signed-off-by: Harry Young --- game/lua_entity.c | 14 ++++++++++---- lua/scripts/lua/borg4/borg4.lua | 4 ++-- lua/scripts/lua/borg5/borg5.lua | 4 ++-- lua/scripts/lua/borg6/borg6.lua | 4 ++-- 4 files changed, 16 insertions(+), 10 deletions(-) diff --git a/game/lua_entity.c b/game/lua_entity.c index ba773d1..f43f787 100644 --- a/game/lua_entity.c +++ b/game/lua_entity.c @@ -3,6 +3,8 @@ #include "g_lua.h" #include "g_spawn.h" +extern qboolean G_CallSpawn(gentity_t *ent); + #ifdef G_LUA // entity.MMBRefit() // this is just a function called from lua @@ -18,7 +20,7 @@ static int Entity_MMBRefit(lua_State * L) trap_GetServerinfo( serverInfo, sizeof( serverInfo ) ); arg2 = Info_ValueForKey( serverInfo, "mapname" ); - if( !Q_stricmp( arg2, "_brig" ) + if( !Q_stricmp( arg2, "_brig" ) // I stole this directly from g_cmds.c, Cmd_CallVote_f || !Q_stricmp( arg2, "_holodeck_camelot" ) || !Q_stricmp( arg2, "_holodeck_firingrange" ) || !Q_stricmp( arg2, "_holodeck_garden" ) || !Q_stricmp( arg2, "_holodeck_highnoon" ) || !Q_stricmp( arg2, "_holodeck_minigame" ) || !Q_stricmp( arg2, "_holodeck_proton" ) || !Q_stricmp( arg2, "_holodeck_proton2" ) || !Q_stricmp( arg2, "_holodeck_temple" ) || !Q_stricmp( arg2, "_holodeck_warlord" ) || !Q_stricmp( arg2, "borg1" ) || !Q_stricmp( arg2, "borg2" ) || !Q_stricmp( arg2, "borg3" ) || !Q_stricmp( arg2, "borg4" ) || !Q_stricmp( arg2, "borg5" ) || !Q_stricmp( arg2, "borg6" ) || !Q_stricmp( arg2, "dn1" ) || !Q_stricmp( arg2, "dn2" ) || !Q_stricmp( arg2, "dn3" ) || !Q_stricmp( arg2, "dn4" ) || !Q_stricmp( arg2, "dn5" ) || !Q_stricmp( arg2, "dn6" ) || !Q_stricmp( arg2, "dn8" ) @@ -29,7 +31,7 @@ static int Entity_MMBRefit(lua_State * L) || !Q_stricmp( arg2, "tour/deck01" ) || !Q_stricmp( arg2, "tour/deck02" ) || !Q_stricmp( arg2, "tour/deck03" ) || !Q_stricmp( arg2, "tour/deck04" ) || !Q_stricmp( arg2, "tour/deck05" ) || !Q_stricmp( arg2, "tour/deck08" ) || !Q_stricmp( arg2, "tour/deck09" ) || !Q_stricmp( arg2, "tour/deck10" ) || !Q_stricmp( arg2, "tour/deck11" ) || !Q_stricmp( arg2, "tour/deck15" ) || !Q_stricmp( arg2, "tutorial" ) || !Q_stricmp( arg2, "voy1" ) || !Q_stricmp( arg2, "voy13" ) || !Q_stricmp( arg2, "voy14" ) || !Q_stricmp( arg2, "voy15" ) || !Q_stricmp( arg2, "voy16" ) || !Q_stricmp( arg2, "voy17" ) || !Q_stricmp( arg2, "voy2" ) || !Q_stricmp( arg2, "voy20" ) || !Q_stricmp( arg2, "voy3" ) || !Q_stricmp( arg2, "voy4" ) || !Q_stricmp( arg2, "voy5" ) || !Q_stricmp( arg2, "voy6" ) || !Q_stricmp( arg2, "voy7" ) || !Q_stricmp( arg2, "voy8" ) || !Q_stricmp( arg2, "voy9" ) ) - MMB = NULL; //init MBB here to do sth pointless + MMB = NULL; //init MMB here to do sth pointless else return 1; //we are not on one of the supported maps @@ -51,6 +53,12 @@ static int Entity_MMBRefit(lua_State * L) MMB->splashDamage = 75; MMB->splashRadius = 75; MMB->s.powerups = 1;//metal + }else if( !Q_stricmp( MMB->model, "models/mapobjects/borg/vynclumn.md3" )){ //no description needed ^^ + MMB->splashDamage = 9999; + MMB->splashRadius = 9999; + MMB->s.powerups = 1;//metal + MMB->spawnflags = 2; + G_CallSpawn(MMB); }else continue;//we are not looking for this kind of MMB } @@ -444,8 +452,6 @@ static int Entity_ToString(lua_State * L) return 1; } -extern qboolean G_CallSpawn(gentity_t *ent); - static void ent_delay(gentity_t *ent) { ent->think = 0; ent->nextthink = -1; diff --git a/lua/scripts/lua/borg4/borg4.lua b/lua/scripts/lua/borg4/borg4.lua index bbb96b8..a52891f 100644 --- a/lua/scripts/lua/borg4/borg4.lua +++ b/lua/scripts/lua/borg4/borg4.lua @@ -294,7 +294,7 @@ function InitGame(levelTime, randomSeed, restart) mover.SetPosition(ent, 488, -184, 16); mover.SetAngles(ent, 0, 90, 0); entity.CallSpawn(ent); - game.Print("-Breakable-Mod..."); + --[[game.Print("-Breakable-Mod..."); game.Print("--misc_model_breakable..."); game.Print("---checking for local or dedicated..."); if not entity.FindNumber(236) == nil then @@ -532,7 +532,7 @@ function InitGame(levelTime, randomSeed, restart) ent:SetKeyValue("splashDamage", "75"); ent:SetKeyValue("splashRadius", "75"); entity.CallSpawn(ent); - end + end ]]-- game.Print("...Done"); end diff --git a/lua/scripts/lua/borg5/borg5.lua b/lua/scripts/lua/borg5/borg5.lua index f41d8dc..251d252 100644 --- a/lua/scripts/lua/borg5/borg5.lua +++ b/lua/scripts/lua/borg5/borg5.lua @@ -273,7 +273,7 @@ function InitGame(levelTime, randomSeed, restart) ent = entity.FindBModel(57); ent:SetKeyValue("team", "2") entity.CallSpawn(ent) - game.Print("--misc_model_breakable..."); + --[[game.Print("--misc_model_breakable..."); game.Print("---checking for local or dedicated..."); if not entity.FindNumber(242) == nil then ent = entity.FindNumber(242); @@ -576,7 +576,7 @@ function InitGame(levelTime, randomSeed, restart) ent:SetKeyValue("splashDamage", "75"); ent:SetKeyValue("splashRadius", "75"); entity.CallSpawn(ent) - end + end]]-- game.Print("...Done"); end diff --git a/lua/scripts/lua/borg6/borg6.lua b/lua/scripts/lua/borg6/borg6.lua index ab10321..733a0f2 100644 --- a/lua/scripts/lua/borg6/borg6.lua +++ b/lua/scripts/lua/borg6/borg6.lua @@ -342,7 +342,7 @@ function InitGame(levelTime, randomSeed, restart) ent = entity.FindBModel(27); ent:SetKeyValue("team", "2") entity.CallSpawn(ent) - game.Print("--misc_model_breakable..."); + --[[game.Print("--misc_model_breakable..."); game.Print("---checking for local or dedicated..."); if not entity.FindNumber(514) == nil then ent = entity.FindNumber(514); @@ -459,7 +459,7 @@ function InitGame(levelTime, randomSeed, restart) ent:SetKeyValue("splashDamage", "75"); ent:SetKeyValue("splashRadius", "75"); entity.CallSpawn(ent); - end + end ]]-- game.Print("...Done"); end