Commit c0b31fdd authored by Mikleo's avatar Mikleo
Browse files

various improvements to /editent

/editent color replaces /setcolor
/editent and /snr no longer require speech marks when using spaces
editent shortcuts size(for brushes) and fadedist(for props)
/create static automatically creates fadedist relative to object size.
Added the ability to change texttimer position in a scenario.
parent e5280eef
Pipeline #12500 passed with stages
in 17 seconds
This diff is collapsed.
......@@ -700,6 +700,31 @@ bool BreakArg(char[] mainString,char[] argString,int argStringSize,int &argIndex
}
bool BreakArgRemainder(char[] mainString,char[] argString,int argStringSize,int &argIndex)
{
if(argIndex == -1)
return false;
// use hidden arg to detect empty string parameters.
bool hiddenArg = (mainString[argIndex] == '"');
strcopy(argString,argStringSize,mainString[argIndex]);
argIndex = -1;
// remove any speech marks.
ReplaceString(argString, argStringSize, "\"", "", false);
// allow default arguments.
if((!argString[0] && !hiddenArg) || argString[0] == '_' && argString[1] == '\0' )
return false;
else
return true;
}
......@@ -922,7 +947,6 @@ public Action Timer_Every(Handle timer,DataPack dataPack1)
}
public int InputCommand(int entity,char[] args,char[] remainder)
{
if(IsValidEntity(entity))
{
int argIndex;
......@@ -1448,9 +1472,28 @@ public Action Timer_TextTimer(Handle timer,DataPack dataPack1)
}
}
}
SetHudTextParams(0.14, 0.021, 0.95, r , g, b, 0,_,1.0,1.0,1.0);
char textTimerPosition[32];
GetScriptVariable("$s_TextTimerPosition",textTimerPosition,sizeof(textTimerPosition));
int argIndex;
float xPos = 0.14;
float yPos = 0.021;
char arg[32];
if(BreakArg(textTimerPosition,arg,sizeof(arg),argIndex))
xPos = StringToFloat(arg);
if(BreakArg(textTimerPosition,arg,sizeof(arg),argIndex))
yPos = StringToFloat(arg);
SetHudTextParams(xPos, yPos, 0.96, r , g, b, 0,_,1.0,1.0,1.0);
for(int i = 1;i<MaxClients;i++)
{
if(IsClientInGame(i))
......
"vertexlitGeneric"
{
"$basetexture" "concrete/concretewall004c.vtf"
}
"vertexlitGeneric"
{
"$basetexture" "stone/stonewall050a.vtf"
}
\ No newline at end of file
......@@ -155,7 +155,7 @@
"name" "KillZone_1"
"target" "KillZone_1_Target"
"position" "0.0 0.0 0.0"
"angles" "0.000000 0.000000 90.000000"
"angles" "0.000000 0.000000 -90.000000"
"model" "models/empfun/cube4.mdl"
"SolidType" "0"
"skin" "11"
......@@ -199,7 +199,7 @@
"name" "KillZone_1"
"target" "KillZone_1_Target"
"position" "0.0 0.0 0.0"
"angles" "0.000000 0.000000 -90.000000"
"angles" "0.000000 0.000000 90.000000"
"model" "models/empfun/cube4.mdl"
"SolidType" "0"
"skin" "11"
......@@ -235,6 +235,190 @@
}
}
"killzone_large_east"
{
"0"
{
"name" "KillZone_1"
"target" "KillZone_1_Target"
"className" "prop_dynamic"
"position" "0.0 0.0 0.0"
"angles" "90.000000 0.000000 0.000000"
"model" "models/empfun/cube4.mdl"
"SolidType" "0"
"skin" "11"
"effects" "80"
"modelscale" "2"
}
"1"
{
"className" "trigger_hurt"
"parent" "KillZone_1"
"name" "killZone_hurt"
"position" "0.000000 0.000000 -500.000000"
"angles" "0.000000 0.000000 0.000000"
"mins" "0 -16000 -16000"
"maxs" "32000 16000 16000"
"damage" "65"
"StartDisabled" "1"
"spawnflags" "64"
"DamageType" "16384"
}
"2"
{
"className" "trigger_hurt"
"parent" "KillZone_1"
"name" "killZone_hurt"
"position" "0.000000 0.000000 -500.000000"
"angles" "0.000000 0.000000 0.000000"
"mins" "50 -15950 -15950"
"maxs" "31950 15950 15950"
"damage" "300"
"StartDisabled" "1"
"spawnflags" "64"
"DamageType" "1"
}
}
"killzone_large_west"
{
"0"
{
"className" "prop_dynamic"
"name" "KillZone_1"
"target" "KillZone_1_Target"
"position" "0.0 0.0 0.0"
"angles" "-90.000000 0.000000 0.000000"
"model" "models/empfun/cube4.mdl"
"MoveType" "0"
"SolidType" "0"
"skin" "11"
"effects" "80"
"modelscale" "2"
}
"1"
{
"className" "trigger_hurt"
"parent" "KillZone_1"
"name" "killZone_hurt"
"position" "0.000000 0.000000 -500.000000"
"angles" "0.000000 0.000000 0.000000"
"mins" "-32000 -16000 -16000"
"maxs" "0 16000 16000"
"damage" "65"
"StartDisabled" "1"
"spawnflags" "64"
"DamageType" "16384"
}
"2"
{
"className" "trigger_hurt"
"parent" "KillZone_1"
"name" "killZone_hurt"
"position" "0.000000 0.000000 -500.000000"
"angles" "0.000000 0.000000 0.000000"
"mins" "-31950 -15950 -15950"
"maxs" "-50 15950 15950"
"damage" "300"
"StartDisabled" "1"
"spawnflags" "64"
"DamageType" "1"
}
}
"killzone_large_north"
{
"0"
{
"className" "prop_dynamic"
"name" "KillZone_1"
"target" "KillZone_1_Target"
"position" "0.0 0.0 0.0"
"angles" "0.000000 0.000000 -90.000000"
"model" "models/empfun/cube4.mdl"
"SolidType" "0"
"skin" "11"
"effects" "80"
"modelscale" "2"
}
"1"
{
"className" "trigger_hurt"
"parent" "KillZone_1"
"name" "killZone_hurt"
"position" "0.000000 0.000000 -500.000000"
"angles" "0.000000 0.000000 0.000000"
"mins" "-16000 0 -16000"
"maxs" "16000 32000 16000"
"damage" "65"
"StartDisabled" "1"
"spawnflags" "64"
"DamageType" "16384"
}
"2"
{
"className" "trigger_hurt"
"parent" "KillZone_1"
"name" "killZone_hurt"
"position" "0.000000 0.000000 -500.000000"
"angles" "0.000000 0.000000 0.000000"
"mins" "-15950 50 -15950"
"maxs" "15950 31950 15950"
"damage" "300"
"StartDisabled" "1"
"spawnflags" "64"
"DamageType" "1"
}
}
"killzone_large_South"
{
"0"
{
"className" "prop_dynamic"
"name" "KillZone_1"
"target" "KillZone_1_Target"
"position" "0.0 0.0 0.0"
"angles" "0.000000 0.000000 90.000000"
"model" "models/empfun/cube4.mdl"
"SolidType" "0"
"skin" "11"
"effects" "80"
"modelscale" "2"
}
"1"
{
"className" "trigger_hurt"
"parent" "KillZone_1"
"name" "killZone_hurt"
"position" "0.000000 0.000000 -500.000000"
"angles" "0.000000 0.000000 0.000000"
"mins" "-16000 -32000 -16000"
"maxs" "16000 0 16000"
"damage" "65"
"StartDisabled" "1"
"spawnflags" "64"
"DamageType" "16384"
}
"2"
{
"className" "trigger_hurt"
"parent" "KillZone_1"
"name" "killZone_hurt"
"position" "0.000000 0.000000 -500.000000"
"angles" "0.000000 0.000000 0.000000"
"mins" "-15950 -31950 -15950"
"maxs" "15950 -50 15950"
"damage" "300"
"StartDisabled" "1"
"spawnflags" "64"
"DamageType" "1"
}
}
"lava_full"
{
"0"
......
......@@ -28,6 +28,7 @@
"MoveType" "0"
"SolidType" "6"
"CollisionGroup" "0"
"effects" "80"
}
"1"
{
......@@ -40,6 +41,7 @@
"MoveType" "0"
"SolidType" "6"
"CollisionGroup" "0"
"effects" "80"
}
"2"
{
......@@ -52,6 +54,7 @@
"MoveType" "0"
"SolidType" "6"
"CollisionGroup" "0"
"effects" "80"
}
"3"
{
......@@ -64,6 +67,7 @@
"MoveType" "0"
"SolidType" "6"
"CollisionGroup" "0"
"effects" "80"
}
"4"
{
......@@ -76,6 +80,7 @@
"MoveType" "0"
"SolidType" "6"
"CollisionGroup" "0"
"effects" "80"
}
"5"
{
......@@ -88,6 +93,7 @@
"MoveType" "0"
"SolidType" "6"
"CollisionGroup" "0"
"effects" "80"
}
"6"
{
......@@ -100,6 +106,7 @@
"MoveType" "0"
"SolidType" "6"
"CollisionGroup" "0"
"effects" "80"
}
"7"
{
......@@ -112,6 +119,7 @@
"MoveType" "0"
"SolidType" "6"
"CollisionGroup" "0"
"effects" "80"
}
}
......@@ -132,6 +140,7 @@
"TakeDamage" "1"
"MinHealthDamage" "0"
"StartDisabled" "0"
"effects" "80"
}
"1"
{
......@@ -146,6 +155,7 @@
"TakeDamage" "1"
"MinHealthDamage" "0"
"StartDisabled" "0"
"effects" "80"
}
"2"
{
......@@ -160,6 +170,7 @@
"TakeDamage" "1"
"MinHealthDamage" "0"
"StartDisabled" "0"
"effects" "80"
}
"3"
{
......@@ -174,6 +185,7 @@
"TakeDamage" "1"
"MinHealthDamage" "0"
"StartDisabled" "0"
"effects" "80"
}
"4"
{
......@@ -188,6 +200,7 @@
"TakeDamage" "1"
"MinHealthDamage" "0"
"StartDisabled" "0"
"effects" "80"
}
"5"
{
......@@ -202,6 +215,7 @@
"TakeDamage" "1"
"MinHealthDamage" "0"
"StartDisabled" "0"
"effects" "80"
}
"6"
{
......@@ -216,6 +230,7 @@
"TakeDamage" "1"
"MinHealthDamage" "0"
"StartDisabled" "0"
"effects" "80"
}
"7"
{
......@@ -230,6 +245,7 @@
"TakeDamage" "1"
"MinHealthDamage" "0"
"StartDisabled" "0"
"effects" "80"
}
"8"
{
......@@ -244,6 +260,7 @@
"TakeDamage" "1"
"MinHealthDamage" "0"
"StartDisabled" "0"
"effects" "80"
}
"9"
{
......@@ -258,6 +275,7 @@
"TakeDamage" "1"
"MinHealthDamage" "0"
"StartDisabled" "0"
"effects" "80"
}
"10"
{
......@@ -272,6 +290,7 @@
"TakeDamage" "1"
"MinHealthDamage" "0"
"StartDisabled" "0"
"effects" "80"
}
"11"
{
......@@ -286,6 +305,7 @@
"TakeDamage" "1"
"MinHealthDamage" "0"
"StartDisabled" "0"
"effects" "80"
}
"12"
{
......@@ -300,6 +320,7 @@
"TakeDamage" "1"
"MinHealthDamage" "0"
"StartDisabled" "0"
"effects" "80"
}
"13"
{
......@@ -314,6 +335,7 @@
"TakeDamage" "1"
"MinHealthDamage" "0"
"StartDisabled" "0"
"effects" "80"
}
"14"
{
......@@ -328,6 +350,7 @@
"TakeDamage" "1"
"MinHealthDamage" "0"
"StartDisabled" "0"
"effects" "80"
}
"15"
{
......@@ -342,6 +365,7 @@
"TakeDamage" "1"
"MinHealthDamage" "0"
"StartDisabled" "0"
"effects" "80"
}
"16"
{
......@@ -356,6 +380,7 @@
"TakeDamage" "1"
"MinHealthDamage" "0"
"StartDisabled" "0"
"effects" "80"
}
"17"
{
......@@ -370,6 +395,7 @@
"TakeDamage" "1"
"MinHealthDamage" "0"
"StartDisabled" "0"
"effects" "80"
}
"18"
{
......@@ -384,6 +410,7 @@
"TakeDamage" "1"
"MinHealthDamage" "0"
"StartDisabled" "0"
"effects" "80"
}
"19"
{
......@@ -398,6 +425,7 @@
"TakeDamage" "1"
"MinHealthDamage" "0"
"StartDisabled" "0"
"effects" "80"
}
"20"
{
......@@ -412,6 +440,7 @@
"TakeDamage" "1"
"MinHealthDamage" "0"
"StartDisabled" "0"
"effects" "80"
}
"21"
{
......@@ -425,6 +454,7 @@
"TakeDamage" "1"
"MinHealthDamage" "0"
"StartDisabled" "0"
"effects" "80"
}
"22"
{
......@@ -438,6 +468,7 @@
"TakeDamage" "1"
"MinHealthDamage" "0"
"StartDisabled" "0"
"effects" "80"
}
"23"
{
......@@ -451,6 +482,7 @@
"TakeDamage" "1"
"MinHealthDamage" "0"
"StartDisabled" "0"
"effects" "80"
}
"24"
{
......@@ -464,6 +496,7 @@
"TakeDamage" "1"
"MinHealthDamage" "0"
"StartDisabled" "0"
"effects" "80"
}
"25"
{
......@@ -477,6 +510,7 @@
"TakeDamage" "1"
"MinHealthDamage" "0"
"StartDisabled" "0"
"effects" "80"
}
"26"
{
......@@ -490,6 +524,7 @@
"TakeDamage" "1"
"MinHealthDamage" "0"
"StartDisabled" "0"
"effects" "80"
}
"27"
{
......@@ -503,6 +538,7 @@
"TakeDamage" "1"
"MinHealthDamage" "0"
"StartDisabled" "0"
"effects" "80"
}
"28"
{
......@@ -516,6 +552,7 @@
"TakeDamage" "1"
"MinHealthDamage" "0"
"StartDisabled" "0"
"effects" "80"
}
"29"
{
......@@ -529,6 +566,7 @@
"TakeDamage" "1"
"MinHealthDamage" "0"
"StartDisabled" "0"
"effects" "80"
}
"30"
{
......@@ -542,6 +580,7 @@
"TakeDamage" "1"
"MinHealthDamage" "0"
"StartDisabled" "0"
"effects" "80"
}
"31"
{
......@@ -555,6 +594,7 @@
"TakeDamage" "1"
"MinHealthDamage" "0"
"StartDisabled" "0"
"effects" "80"
}
}
}
......
......@@ -34,4 +34,6 @@
"materials/models/empfun/platform11.vmt" "file"
"materials/models/empfun/platform12.vmt" "file"
"materials/models/empfun/platform13.vmt" "file"
"materials/models/empfun/platform14.vmt" "file"
"materials/models/empfun/platform15.vmt" "file"
}
\ No newline at end of file
......@@ -551,7 +551,6 @@
"emp_resource_point_prop"
{
"extend" "entity"
"handleOnly" "1"
"group" "2"
"fields"
{
......@@ -575,6 +574,7 @@
{
"extend" "entity"
"version" "0.22"
"handleOnly" "1"
"group" "2"
"fields"
{
......@@ -920,8 +920,22 @@
"propType" "data"
"defaultValue" "1"
}
"fademindist"
{
"fgdName" "fademindist"
"type" "float"
"prop" "m_fadeMinDist"
"propType" "data"
"defaultValue" "-1.000000"
}
"fademaxdist"
{
"fgdName" "fademaxdist"
"type" "float"
"prop" "m_fadeMaxDist"
"propType" "data"
"defaultValue" "0.000000"
}
}
}
......
......@@ -4,7 +4,7 @@
{
"Version"
{
"Latest" "1.35"
"Latest" "1.36"
}
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment