stjr
/
ZoneBuilder
mirror of https://git.do.srb2.org/STJr/ZoneBuilder.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merged in GZDB r2481.

This commit is contained in:
MascaraSnake 2016-01-23 10:01:27 +01:00
parent 04527b3230
commit 4511d5976b
5 changed files with 74 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Build/Compilers/ZDoom/zdefs.acs
View File

@ -958,6 +958,12 @@
#define SECF_NOFALLINGDAMAGE 2
#define SECF_FLOORDROP 4
#define SECF_NORESPAWN 8
#define SECF_FRICTION 16
#define SECF_PUSH 32
#define SECF_SILENTMOVE 64
#define SECF_DMGTERRAINFX 128
#define SECF_DMGENDGODMODE 256
#define SECF_DMGENDLEVEL 512
#define BLOCKF_CREATURES 1
#define BLOCKF_MONSTERS 2

6
Build/Compilers/ZDoom/zspecial.acs
View File

@ -337,8 +337,10 @@ special
-91:QuakeEx(8,12),
-92:Warp(6,11),
-93:GetMaxInventory(2),
-94:SetSectorDamage(2,6),
-94:SetSectorDamage(2,5),
-95:SetSectorTerrain(3),
-96:SpawnParticle(1,15),
// Zandronum's
-100:ResetMap(0),
-101:PlayerIsSpectator(1),

7
Build/Scripting/ZDoom_ACS.cfg
View File

@ -409,6 +409,7 @@ keywords
Spawn = "int Spawn(str classname, fixed x, fixed y, fixed z[, int tid[, int angle]])\nSpawns an actor at the given X, Y and Z coordinates.\nOptionally a TID and a byte angle can be specified.";
SpawnForced = "int SpawnForced(str classname, fixed x, fixed y, fixed z[, int tid[, int angle]])\nForces the actor to spawn, even in conditions where the spawning would normally fail.\nThe return value is the number of things spawned.";
SpawnDecal = "int SpawnDecal(int tid, str decalname, int flags[, fixed angle = 0.0[, fixed zoffset = 0.0[, fixed distance = 64.0]]])\nCreates a decal on a wall by tracing a line from the actor with the\nspecified tid until hitting said wall, on which the decal is then created.\nIf tid is 0, the tracing is done from the activator of the script.\ndecalname: The name of the decal to create, as defined in DECALDEF.\nflags: use SDF_ flags\nThe return value of the function is the number of decals spawned.";
SpawnParticle = "void SpawnParticle(float offx, float offy, float offz, float velx, float vely, float velz, color color1, int lifetime[, bool fullbright = false[, float startalpha = 1.0[, int size = 1[, float fadestep = -1[, float accelx = 0[, float accely = 0[, float accelz = 0]]]]]]])";
SpawnProjectile = "void SpawnProjectile(int tid, str type, int angle, int speed, int vspeed, int gravity, int newtid)";
SpawnSpot = "int SpawnSpot(str classname, int spottid[, int tid[, int angle]])\nRequires a MapSpot at the location where you want the Actor to spawn.\nThe return value is the number of things spawned.";
SpawnSpotFacing = "int SpawnSpotFacing(str classname, int spottid[, int tid])\nRequires a MapSpot at the location where you want the Actor to spawn.\nThe thing will assume the angle of the mapspot it is spawned to.\nThe return value is the number of things spawned.";
@ -954,10 +955,16 @@ constants
SCROLL_AND_CARRY;
SDF_ABSANGLE;
SDF_PERMANENT;
SECF_DMGENDGODMODE;
SECF_DMGENDLEVEL;
SECF_DMGTERRAINFX;
SECF_FLOORDROP;
SECF_FRICTION;
SECF_NOFALLINGDAMAGE;
SECF_NORESPAWN;
SECF_PUSH;
SECF_SILENT;
SECF_SILENTMOVE;
SECSEQ_CEILING;
SECSEQ_FLOOR;
SECSEQ_FULLHEIGHT;

1
Build/Scripting/ZDoom_DECORATE.cfg
View File

@ -120,6 +120,7 @@ keywords
A_SpawnDebris = "A_SpawnDebris(str type[, bool translation = false[, float horizontal_vel = 1.0[, float vertical_vel = 1.0]]])";
A_SpawnItem = "A_SpawnItem(str type, int distance, float zpos, bool useammo, bool translation)";
A_SpawnItemEx = "A_SpawnItemEx(str type[, float xoffset = 0.0[, float yoffset = 0.0[, float zoffset = 0.0[, float xvelocity = 0.0[, float yvelocity = 0.0[, float zvelocity = 0.0[, float angle = 0.0[, int flags = 0[, int skipchance = 0[, int tid = 0]]]]]]]]]])";
A_SpawnParticle = "A_SpawnParticle(float offx, float offy, float offz, float velx, float vely, float velz, color color1, int lifetime[, bool fullbright = false[, float startalpha = 1.0[, int size = 1[, float fadestep = -1[, float accelx = 0[, float accely = 0[, float accelz = 0]]]]]]])";
//State jumps
A_CheckBlock = "A_CheckBlock(str block[, int flags = 0[, int pointer = AAPTR_TARGET]])";
A_CheckCeiling = "A_CheckCeiling(int offset OR str state)";

124
Source/Core/Windows/VertexEditForm.cs
View File

@ -202,84 +202,72 @@ namespace CodeImp.DoomBuilder.Windows
foreach(Vertex v in vertices) v.Fields.BeforeFieldsChange();
}
}
#endregion
#region ================== mxd. Realtime Events
#endregion
private void positionx_WhenTextChanged(object sender, EventArgs e)
{
if(preventchanges) return;
MakeUndo();
int i = 0;
#region ================== mxd. Realtime Events
//restore values
if(string.IsNullOrEmpty(positionx.Text))
{
// Apply position
foreach(Vertex v in vertices) v.Move(new Vector2D(vertexprops[i++].X, v.Position.y));
}
else //update values
{
// Verify the coordinates
float px = positionx.GetResultFloat(vertexprops[i].X);
if(px < General.Map.FormatInterface.MinCoordinate)
{
positionx.Text = General.Map.FormatInterface.MinCoordinate.ToString();
return;
}
if(px > General.Map.FormatInterface.MaxCoordinate)
{
positionx.Text = General.Map.FormatInterface.MaxCoordinate.ToString();
return;
}
private void positionx_WhenTextChanged(object sender, EventArgs e)
{
if (preventchanges) return;
MakeUndo();
// Apply position
foreach(Vertex v in vertices) v.Move(new Vector2D(px, v.Position.y));
}
// Restore values
if (string.IsNullOrEmpty(positionx.Text))
{
// Apply position
int i = 0;
foreach (Vertex v in vertices) v.Move(new Vector2D(vertexprops[i++].X, v.Position.y));
}
// Update values
else
{
int i = 0;
foreach (Vertex v in vertices)
{
// Verify the coordinates
float px = positionx.GetResultFloat(vertexprops[i++].X);
General.Map.IsChanged = true;
if(OnValuesChanged != null) OnValuesChanged(this, EventArgs.Empty);
}
// Apply new position
v.Move(new Vector2D(Math.Max(General.Map.FormatInterface.MinCoordinate, Math.Min(General.Map.FormatInterface.MaxCoordinate, px)), v.Position.y));
}
}
private void positiony_WhenTextChanged(object sender, EventArgs e)
{
if(preventchanges) return;
MakeUndo();
int i = 0;
General.Map.IsChanged = true;
if (OnValuesChanged != null) OnValuesChanged(this, EventArgs.Empty);
}
//restore values
if(string.IsNullOrEmpty(positiony.Text))
{
// Apply position
foreach(Vertex v in vertices) v.Move(new Vector2D(v.Position.x, vertexprops[i++].Y));
}
else //update values
{
// Verify the coordinates
float py = positiony.GetResultFloat(vertexprops[i].Y);
if(py < General.Map.FormatInterface.MinCoordinate)
{
positiony.Text = General.Map.FormatInterface.MinCoordinate.ToString();
return;
}
if(py > General.Map.FormatInterface.MaxCoordinate)
{
positiony.Text = General.Map.FormatInterface.MaxCoordinate.ToString();
return;
}
private void positiony_WhenTextChanged(object sender, EventArgs e)
{
if (preventchanges) return;
MakeUndo();
// Apply position
foreach(Vertex v in vertices) v.Move(new Vector2D(v.Position.x, py));
}
// Restore values
if (string.IsNullOrEmpty(positiony.Text))
{
// Apply position
int i = 0;
foreach (Vertex v in vertices) v.Move(new Vector2D(v.Position.x, vertexprops[i++].Y));
}
// Update values
else
{
int i = 0;
foreach (Vertex v in vertices)
{
// Verify the coordinates
float py = positiony.GetResultFloat(vertexprops[i++].Y);
General.Map.IsChanged = true;
if(OnValuesChanged != null) OnValuesChanged(this, EventArgs.Empty);
}
// Apply new position
v.Move(new Vector2D(v.Position.x, Math.Max(General.Map.FormatInterface.MinCoordinate, Math.Min(General.Map.FormatInterface.MaxCoordinate, py))));
}
}
private void zceiling_WhenTextChanged(object sender, EventArgs e)
General.Map.IsChanged = true;
if (OnValuesChanged != null) OnValuesChanged(this, EventArgs.Empty);
}
private void zceiling_WhenTextChanged(object sender, EventArgs e)
{
if(preventchanges) return;
MakeUndo();