jackz/sourcemod-plugins
1
0
Fork 0
mirror of https://github.com/Jackzmc/sourcemod-plugins.git synced 2025-05-09 01:13:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Compare commits

base: jackz:b9b4dde36663dd924b2a273086df9c18b4aa3298
Branches Tags
jackz:master
jackz:rewrite
jackz:ftt/rockthrow
jackz:ftt-rewrite
...
compare: jackz:cfa976cd952d3bdd707f04e81a539bd98b7570e5
Branches Tags
jackz:master
jackz:rewrite
jackz:ftt/rockthrow
jackz:ftt-rewrite

4 commits
b9b4dde366 ... cfa976cd95

Author SHA1 Message Date
Jackz
cfa976cd95 Minor fixes 2024-07-18 19:07:56 -05:00
Jackz
06058f835d Improve prop spawner model list 2024-07-18 19:07:48 -05:00
Jackz
6f692cfa08 Fix bad CheckEntity code 2024-07-18 19:07:27 -05:00
Jackz
1afa946472 Fix wall creator 2024-07-18 19:07:14 -05:00
11 changed files with 167 additions and 291 deletions
Download patch file Download diff file Expand all files Collapse all files

27
data/prop_spawner/models/Fencing/barriers.txt
View file

@ -1,27 +0,0 @@
Barriers
models/props_fortifications/barricade001_128_reference.mdl Metal Mesh Barricade (128u)
models/props_fortifications/barricade001_64_reference.mdl Metal Mesh Barricade (64u)
models/props_fortifications/barricade_gate001_64_reference.mdl Metal Mesh Barricade Gate (64u)
models/props_fortifications/barricade_razorwire001_128_reference.mdl Barricade Razorwire (128u) (no collision)
models/props_fortifications/concrete_barrier01.mdl Concrete wall
models/props_fortifications/concrete_barrier001_96_reference.mdl Concrete crash barrier (96u)
models/props_fortifications/concrete_barrier001_128_reference.mdl Concrete crash barrier (128u)
models/props_fortifications/concrete_post001_48.mdl Concrete Post (48u)
models/props_fortifications/concrete_wall001_96_reference.mdl Concrete wall (96u)
models/props_fortifications/concrete_block001_128_reference.mdl Concrete block (128u)
models/props_fortifications/police_barrier001_128_reference.mdl Police Barrier Notice
models/props_fortifications/fortification_indoor_01.mdl Luggage Push Fort
models/props_fortifications/sandbags_line2.mdl Building sandbags 6 layers
models/props_fortifications/sandbags_corner3.mdl Building sandbags 4 layers curved
models/props_fortifications/sandbags_corner2.mdl Building sandbags 6 layers curved
models/props_fortifications/traffic_barrier001.mdl Traffic Barrier
models/props_urban/railroad_gate001.mdl Railroad Crossing Light
models/props_urban/railroad_gate_arm001.mdl Railroad Crossing Arm
models/props_downtown/bollards_ornate.mdl Ornate metal bollard
models/props_street/bollards_512.mdl Bollard (512u)
models/props_unique/wooden_barricade.mdl Wooden barricade (no damage)
models/props_unique/wooden_barricade_break1.mdl wooden barricade (low damage)
models/props_unique/wooden_barricade_break2.mdl Wooden barricade (medium damage)
models/props_unique/wooden_barricade_break3.mdl wooden barricade (high damage)
models/props_c17/concrete_barrier001a.mdl Concrete crash barrier-higher
models/props_exteriors/guardrail128a.mdl road guardrail (128u)

79
data/prop_spawner/models/Fencing/fences.txt
View file

@ -1,79 +0,0 @@
Fences & Gates
models/lighthouse/props/wooden_gate.mdl Valerie's fancy wooden gate
models/props_exteriors/fence002.mdl wooden fence (very long)
models/props_exteriors/fence002_end.mdl wooden fence end
models/props_urban/fence_gate001_256.mdl urban fence gate (easy to use)
models/props_urban/fence_cover001_64.mdl shelter Fence (64u)
models/props_urban/fence_cover001_128.mdl shelter fence (128u)
models/props_urban/fence_cover001_256.mdl shelter fence (256u)
models/props_fortifications/barricade_gate001_64_reference.mdl roadblock-single layer without handle (easy to use)
models/props_fortifications/barricade001_64_reference.mdl roadblock-single layer
models/props_fortifications/barricade001_128_reference.mdl roadblock-double layer
models/props_unique/airport/temp_barricade.mdl roadblock-airport
models/props_wasteland/exterior_fence002b.mdl Barbed wire fence - 1 wide skinny
models/props_wasteland/exterior_fence002c.mdl Barbed wire fence - 1 wide
models/props_wasteland/exterior_fence002d.mdl Barbed wire fence - 2 wide
models/props_wasteland/exterior_fence002e.mdl Barbed wire fence - 4 wide
models/props_street/police_barricade.mdl Police Barricade - 1 wide
models/props_street/police_barricade2.mdl Police barricade - 3 wide
models/props_street/police_barricade3.mdl Police Barricade - 6 wide
models/props_street/police_barricade_368in.mdl Police Barricade - 8 wide
models/props_street/police_barricade_496in.mdl Police Barricade - 10 wide
models/props_street/police_barricade4.mdl Iron Frame Barricade - 12 wide
models/lostcoast/props_wasteland/gate01a.mdl Iron fence gate a
models/lostcoast/props_wasteland/gate01b.mdl iron fence gate b
models/props_mill/elevator01_cage.mdl Mill Elevator-c4m2
models/props_mill/elevator01_cagedoor02.mdl Mill Elevator telescopic door-c4m2 (No Collision)
models/props_mill/elevator01_cagedoor.mdl Mill Elevator Cage door
models/props_mill/elevator01_framework.mdl Elevator shaft framework
models/props_mill/freightelevatorbutton01.mdl Mill Freight Elevator Button 1
models/props_mill/freightelevatorbutton02.mdl Mill Freight Elevator Button 2
models/props_street/barricade_door_01.mdl Military Agency Door-c9m1
models/props_urban/fence_768_collapsed.mdl Fence with covered shelter-c4m5
models/props_urban/gate_wall003_32.mdl Screening fence wall (32u)
models/props_urban/gate_wall003_64.mdl Screening fence wall (64u)
models/props_urban/gate_wall003_128.mdl Shelter fence wall (128u)
models/props_urban/gate_wall_gate003_64.mdl Wall Gate 3 (64u)
models/props_urban/wood_fence001_64.mdl Urban wooden fence a (64u)
models/props_urban/wood_fence001_128.mdl Urban wooden fence a (128u)
models/props_urban/wood_fence001_256.mdl Urban wooden fence a (256u)
models/props_urban/wood_fence002_64.mdl Urban wooden fence b (64u)
models/props_urban/wood_fence002_128.mdl Urban wooden fence b (128u)
models/props_urban/wood_fence002_256.mdl Urban wooden fence b (256u)
models/props_urban/wood_post001.mdl Urban Wood Post 1
models/props_urban/wood_post002.mdl Urban Wood Post 2
models/props_cemetery/cemetery_gate.mdl Cemetary Gate Barbed Wire with Spikes
models/props_cemetery/cemetery_gate_32.mdl Cemetary Gate Barbed Wire with Spikes (32u)
models/props_cemetery/cemetery_gate_64.mdl Cemetary Gate Barbed Wire with Spikes (64u)
models/props_cemetery/cemetery_gate_128.mdl Cemetary Gate Barbed Wire with Spikes (128u)
models/props_exteriors/roadsidefence_64.mdl Road fence-single layer (64u)
models/props_exteriors/roadsidefence_512.mdl road fence-eight layers (512u)
models/props_exteriors/fence_plastic001.mdl Plastic Fence
models/props_downtown/garden_gate.mdl Downtown Garden Gate
models/props/de_inferno/wood_fence.mdl De Inferno Wood Fence
models/props/de_inferno/wood_fence_end.mdl De Inferno Wood Fence End
models/props_urban/fence001_128.mdl Urban Chain Link Fence1 (128u)
models/props_urban/fence001_256.mdl Urban Chain Link Fence1 (256u)
models/props_urban/fence001_64.mdl Urban Chain Link Fence1 (64u)
models/props_urban/fence002_128.mdl Urban Chain Link Fence2 (128u)
models/props_urban/fence002_256.mdl Urban Chain Link Fence2 (256u)
models/props_urban/fence002_64.mdl Urban Chain Link Fence2 (64u)
models/props_urban/fence003_128.mdl Urban Chain Link Fence3 (128u)
models/props_urban/fence003_64.mdl Urban Chain Link Fence3 (64u)
models/props_urban/fence004_128.mdl Urban Chain Link Fence Frame (128u)
models/props_urban/fence004_256.mdl Urban Chain Link Fence Frame (256u)
models/props_urban/fence004_64.mdl Urban Fence Chain Link Frame (64u)
models/props_urban/fence_barbwire001_128.mdl Urban Barbwire Fence (128u)
models/props_urban/fence_barbwire001_256.mdl Urban Barbwire Fence (256u)
models/props_urban/fence_barbwire001_64.mdl Urban Barbwire Fence (64u)
models/props_urban/fence_post_barbwire001.mdl Urban Barbwire Fence Post
models/props_urban/fence_gate001_128.mdl Urban Fence Gate1 (128u)
models/props_urban/fence_gate001_256.mdl Urban Fence Gate1 (256u)
models/props_urban/fence_gate002_256.mdl Urban Fence Gate2 (256u)
models/props_urban/fence_gate003.mdl Urban Fence Gate3 (Small)
models/props_urban/fence_gate_post001.mdl Urban Chain Link Fence Gate Post 1
models/props_urban/fence_gate_post003.mdl Urban Chain Link Fence Gate Post 2
models/props_urban/fence_post001.mdl Urban Chain Link Fence Post 1
models/props_urban/fence_post002.mdl Urban Chain Link Fence Post 2
models/props_urban/fence_post003.mdl Urban Chain Link Fence Post 3
models/props_urban/gate_column001_32.mdl Urban Gate Column

28
data/prop_spawner/models/Fencing/walls.txt
View file

@ -1,28 +0,0 @@
Walls
models/props_update/brick_128.mdl brick wall/floor (128u)
models/props_update/brick_256.mdl brick wall/floor (256u)
models/props_update/concrete_128.mdl cement wall/floor (128u)
models/props_update/concrete_256.mdl cement wall/floor (256u)
models/props_update/plywood_128.mdl wooden wall/floor (128u)
models/props_update/plywood_256.mdl wooden wall/floor (256u)
models/props_update/whitebrick_128.mdl white brick wall (128u)
models/props_update/whitebrick_256.mdl white brick wall (256u)
models/props_update/wood_128.mdl wooden walls (128u)
models/props_update/wood_256.mdl wooden walls (256u)
models/props_urban/gate_wall001_64.mdl Urban Wall (64u)
models/props_urban/gate_wall001_128.mdl Urban Wall (128u)
models/props_urban/gate_wall001_256.mdl Urban Wall (256u)
models/props_urban/gate_wall002_128.mdl urban fence wall (128u)
models/props_unique/zombiebreakwallexteriorairport01_main.mdl Wallpaper - Airport
models/props_unique/zombiebreakwallexteriorairportoffices01_main.mdl Wallpaper - Airport Office
models/props_unique/zombiebreakwallhospitalexterior01_main.mdl Wallpaper - Hospital
models/lighthouse/props/wall_144_324.mdl Wall-144X(324u) (No Side)
models/props_interiors/constructionwalls02checkpoint.mdl steel building framing (with doorway)
models/props_interiors/constructionwalls03.mdl steel building framing
models/props_interiors/constructionwalls04_damage01.mdl Extra-long building steel column
models/props_cemetery/crypts_wall.mdl Thickened stone wall-Cemetery Exposed Brick
models/props_mill/locker_roof_collapsed01.mdl Mill Locker Roof Collapsed (no side)
models/props_mill/millwall_01.mdl Mill wall 1 (no side)
models/props_mill/millwall_02.mdl Mill wall 2 (no side)
models/props_mill/millwall_03.mdl Mill wall 3 (no side)
models/props_mill/column_01.mdl Mill Rebar Column

2
data/prop_spawner/models/Furniture/misc.txt
View file

@ -35,7 +35,7 @@ models/props_interiors/baby_crib.mdl Baby Crib
models/props_furniture/piano.mdl piano
models/props_interiors/mounteddeerhead01.mdl Deer head specimen
models/props_unique/guncabinet_no_door_static.mdl wooden gun cabinet (solid state)
models/props_unique/guncabinet01_main.mdl Metal gun cabinet
models/props_unique/guncabinet01_main.mdl Metal Gun Cabinet
models/props_unique/guncabinet01_ldoor.mdl Metal Gun Cabinet Left Door
models/props_unique/guncabinet01_rdoor.mdl Metal Gun Cabinet Right Door
models/lighthouse/props/wooden_cabinet.mdl Wooden cabinet cabin

9
data/prop_spawner/models/construction.txt
View file

@ -8,6 +8,7 @@ models/props/de_prodigy/concretebags.mdl Concrete Bags 1
models/props/de_prodigy/concretebags2.mdl Concrete Bags 2
models/props/de_prodigy/concretebags3.mdl Concrete Bags 3
models/props/de_prodigy/wood_pallet_01.mdl Wood Pallet 1
models/props/cs_assault/acunit01.mdl Air Conditioner Unit
models/props/de_prodigy/wood_pallet_debris_01.mdl Wood Pallet Piece 1-1
models/props/de_prodigy/wood_pallet_debris_02.mdl Wood Pallet Piece 1-2
models/props/de_prodigy/wood_pallet_debris_04.mdl Wood Pallet Piece 1-3
@ -46,6 +47,14 @@ models/props_industrial/warehouse_shelf004.mdl Warehouse Shelves 4
models/props_industrial/wire_spool_01.mdl cable coil
models/props_industrial/wire_spool_02.mdl cable reel-no wire
models/props_equipment/construction_lift.mdl construction lift
models/props_pipes/pipeset32d_corner128r_001a.mdl Pipe Corner Horizontal (128u)
models/props_pipes/pipeset32d_corner128d_001a.mdl Pipe Corner Vertical (128u)
models/props_pipes/pipeset32d_bend256d_001a.mdl Pipe Corner Bend/Slide (256u)
models/props_pipes/pipeset32d_128_001a.mdl Pipe (128u)
models/props_pipes/pipeset32d_256_001a.mdl Pipe (256u)
models/props_pipes/pipeset32d_512_001a.mdl Pipe (512u)
models/props_pipes/concrete_pipe001a.mdl Concrete Pipe
models/props_pipes/concrete_pipe_filler02.mdl Concrete Pipe Filler
models/props_vents/ventbreakable01.mdl vent pipe window cover (breakable)
models/props_vents/ventbreakable01_dm01_frame.mdl Vent Frame
models/props_vents/ventbreakable01_dm01_part01.mdl Vent Piece 1

48
data/randomizer/c3m4_plantation.json
View file

@ -6,7 +6,7 @@
"weight": 1,
"entities": [
{
"model": "models/props_foliage/hedge_128.mdl",
"model": "models/props_foliage/urban_hedge_128_64_high.mdl",
"origin": [
1582.585693359375,
-1131.2296142578125,
@ -32,7 +32,7 @@
]
},
{
"model": "models/props_foliage/hedge_128.mdl",
"model": "models/props_foliage/urban_hedge_128_64_high.mdl",
"origin": [
1807.994873046875,
-1134.41015625,
@ -853,7 +853,7 @@
]
},
{
"model": "models/props_foliage/hedge_128.mdl",
"model": "models/props_foliage/urban_hedge_128_64_high.mdl",
"origin": [
1622.0169677734375,
1282.147705078125,
@ -866,7 +866,7 @@
]
},
{
"model": "models/props_foliage/hedge_128.mdl",
"model": "models/props_foliage/urban_hedge_128_64_high.mdl",
"origin": [
1729.8924560546875,
1282.8870849609375,
@ -1087,7 +1087,7 @@
]
},
{
"model": "models/props_foliage/hedge_128.mdl",
"model": "models/props_foliage/urban_hedge_128_64_high.mdl",
"origin": [
2566.703369140625,
1367.6995849609375,
@ -1100,7 +1100,7 @@
]
},
{
"model": "models/props_foliage/hedge_128.mdl",
"model": "models/props_foliage/urban_hedge_128_64_high.mdl",
"origin": [
2467.2890625,
1399.7459716796875,
@ -1113,7 +1113,7 @@
]
},
{
"model": "models/props_foliage/hedge_128.mdl",
"model": "models/props_foliage/urban_hedge_128_64_high.mdl",
"origin": [
2428.86083984375,
1416.4720458984375,
@ -1126,7 +1126,7 @@
]
},
{
"model": "models/props_foliage/hedge_128.mdl",
"model": "models/props_foliage/urban_hedge_128_64_high.mdl",
"origin": [
2717.69580078125,
1305.3656005859375,
@ -1139,7 +1139,7 @@
]
},
{
"model": "models/props_foliage/hedge_128.mdl",
"model": "models/props_foliage/urban_hedge_128_64_high.mdl",
"origin": [
2667.630859375,
1346.663330078125,
@ -1152,7 +1152,7 @@
]
},
{
"model": "models/props_foliage/hedge_128.mdl",
"model": "models/props_foliage/urban_hedge_128_64_high.mdl",
"origin": [
2804.379638671875,
1353.5198974609375,
@ -1165,7 +1165,7 @@
]
},
{
"model": "models/props_foliage/hedge_128.mdl",
"model": "models/props_foliage/urban_hedge_128_64_high.mdl",
"origin": [
2866.937255859375,
1411.8472900390625,
@ -1178,7 +1178,7 @@
]
},
{
"model": "models/props_foliage/hedge_128.mdl",
"model": "models/props_foliage/urban_hedge_128_64_high.mdl",
"origin": [
2878.0654296875,
1462.4364013671875,
@ -1191,7 +1191,7 @@
]
},
{
"model": "models/props_foliage/hedge_128.mdl",
"model": "models/props_foliage/urban_hedge_128_64_high.mdl",
"origin": [
2944.297119140625,
1246.700439453125,
@ -1217,7 +1217,7 @@
]
},
{
"model": "models/props_foliage/hedge_128.mdl",
"model": "models/props_foliage/urban_hedge_128_64_high.mdl",
"origin": [
2802.26171875,
1223.635498046875,
@ -1230,7 +1230,7 @@
]
},
{
"model": "models/props_foliage/hedge_128.mdl",
"model": "models/props_foliage/urban_hedge_128_64_high.mdl",
"origin": [
2944.923095703125,
1365.22802734375,
@ -1243,7 +1243,7 @@
]
},
{
"model": "models/props_foliage/hedge_128.mdl",
"model": "models/props_foliage/urban_hedge_128_64_high.mdl",
"origin": [
2947.600341796875,
1084.9835205078125,
@ -1256,7 +1256,7 @@
]
},
{
"model": "models/props_foliage/hedge_128.mdl",
"model": "models/props_foliage/urban_hedge_128_64_high.mdl",
"origin": [
2834.375732421875,
1068.7667236328125,
@ -1269,7 +1269,7 @@
]
},
{
"model": "models/props_foliage/hedge_128.mdl",
"model": "models/props_foliage/urban_hedge_128_64_high.mdl",
"origin": [
2904.023193359375,
1166.3035888671875,
@ -1282,7 +1282,7 @@
]
},
{
"model": "models/props_foliage/hedge_128.mdl",
"model": "models/props_foliage/urban_hedge_128_64_high.mdl",
"origin": [
2685.578369140625,
1123.2955322265625,
@ -1295,7 +1295,7 @@
]
},
{
"model": "models/props_foliage/hedge_128.mdl",
"model": "models/props_foliage/urban_hedge_128_64_high.mdl",
"origin": [
2752.009033203125,
1024.3072509765625,
@ -1308,7 +1308,7 @@
]
},
{
"model": "models/props_foliage/hedge_128.mdl",
"model": "models/props_foliage/urban_hedge_128_64_high.mdl",
"origin": [
2694.9306640625,
948.69085693359375,
@ -1347,7 +1347,7 @@
]
},
{
"model": "models/props_foliage/hedge_128.mdl",
"model": "models/props_foliage/urban_hedge_128_64_high.mdl",
"origin": [
2112.7802734375,
1043.9244384765625,
@ -1360,7 +1360,7 @@
]
},
{
"model": "models/props_foliage/hedge_128.mdl",
"model": "models/props_foliage/urban_hedge_128_64_high.mdl",
"origin": [
1873.318359375,
1067.7713623046875,
@ -1373,7 +1373,7 @@
]
},
{
"model": "models/props_foliage/hedge_128.mdl",
"model": "models/props_foliage/urban_hedge_128_64_high.mdl",
"origin": [
1986.8575439453125,
1065.7440185546875,

BIN
plugins/l4d2_editor.smx
View file

Binary file not shown.

BIN
plugins/l4d2_randomizer.smx
View file

Binary file not shown.

5
scripting/include/editor/editor.sp
View file

@ -156,13 +156,12 @@ enum struct EditorData {
}
bool CheckEntity() {
if(this.entity != INVALID_ENT_REFERENCE) {
if(this.entity == -1 && !IsValidEntity(this.entity)) {
if(this.flags & Edit_WallCreator) return true;
if(this.entity == INVALID_ENT_REFERENCE || this.entity == -1 || !IsValidEntity(this.entity)) {
PrintToChat(this.client, "\x04[Editor]\x01 Entity has vanished, editing cancelled.");
this.Reset();
return false;
}
}
return true;
}

10
scripting/l4d2_editor.sp
View file

@ -294,14 +294,14 @@ public Action OnPlayerRunCmd(int client, int& buttons, int& impulse, float vel[3
Editor[client].size[0] += Editor[client].moveSpeed;
}
if(buttons & IN_FORWARD) {
Editor[client].IncrementSize(0, 1.0);
Editor[client].IncrementSize(1, 1.0);
} else if(buttons & IN_BACK) {
Editor[client].IncrementSize(0, -1.0);
Editor[client].IncrementSize(1, -1.0);
}
if(buttons & IN_JUMP) {
Editor[client].IncrementSize(0, 1.0);
Editor[client].IncrementSize(2, 1.0);
} else if(buttons & IN_DUCK) {
Editor[client].IncrementSize(0, -1.0);
Editor[client].IncrementSize(2, -1.0);
}
}
}
@ -577,8 +577,10 @@ stock bool CalculateEditorPosition(int client, TraceEntityFilter filter) {
TR_TraceRayFilter(clientEye, Editor[client].origin, MASK_OPAQUE, RayType_EndPoint, filter, client);
if (TR_DidHit(INVALID_HANDLE)) {
TR_GetEndPosition(Editor[client].origin);
if(~Editor[client].flags & Edit_WallCreator) {
GetEntPropVector(Editor[client].entity, Prop_Send, "m_vecMins", direction);
Editor[client].origin[2] -= direction[2];
}
if(Editor[client].hasCollisionRotate) {
TR_GetPlaneNormal(INVALID_HANDLE, Editor[client].angles);
GetVectorAngles(Editor[client].angles, Editor[client].angles);

6
scripting/l4d2_randomizer.sp
View file

@ -219,7 +219,7 @@ Action Command_ExportEnt(int client, int args) {
GetEntPropVector(entity, Prop_Send, "m_angRotation", angles);
GetEntPropVector(entity, Prop_Send, "m_vecMaxs", size);
char model[64];
char model[128];
ReplyToCommand(client, "{");
GetEntityClassname(entity, model, sizeof(model));
if(StrContains(model, "prop_") == -1) {
@ -358,7 +358,7 @@ JSONObject ExportEntity(int entity, ExportType exportType = Export_Model) {
GetEntPropVector(entity, Prop_Send, "m_angRotation", angles);
GetEntPropVector(entity, Prop_Send, "m_vecMaxs", size);
char model[64];
char model[128];
JSONObject entityData = new JSONObject();
GetEntityClassname(entity, model, sizeof(model));
if(StrContains(model, "prop_") == -1) {
@ -552,7 +552,7 @@ enum struct SceneVariantData {
enum struct VariantEntityData {
char type[32];
char model[64];
char model[128];
float origin[3];
float angles[3];
float scale[3];