Skip to content

Commit 4b6eb9c

Browse files
gaejuckgaejuck
authored
Merge pull request #5 from redsunservers/master
4.7.0
2 parents 1808ee7 + 1ef6cfa commit 4b6eb9c

34 files changed

Lines changed: 2082 additions & 1520 deletions

‎.github/workflows/compile.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010

1111
strategy:
1212
matrix:
13-
version: ["1.11", "1.12"]
13+
version: ["1.12", "1.13"]
1414

1515
steps:
1616
- name: Checkout

‎.github/workflows/package.yml‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414

1515
- name: Environments
1616
run: |
17-
echo "SM_VERSION=1.11" >> $GITHUB_ENV
17+
echo "SM_VERSION=1.12" >> $GITHUB_ENV
1818
echo "PLUGIN_VERSION_REVISION<<EOF" >> $GITHUB_ENV
1919
git rev-list --count HEAD >> $GITHUB_ENV
2020
echo 'EOF' >> $GITHUB_ENV
@@ -36,8 +36,9 @@ jobs:
3636
run: |
3737
bash scripts/package.sh
3838
39-
- name: Upload Artifacts
40-
uses: actions/upload-artifact@master
39+
- name: Release
40+
uses: softprops/action-gh-release@v2
4141
with:
42-
name: SuperZombieFortress-${{env.PLUGIN_VERSION}}.${{env.PLUGIN_VERSION_REVISION}}
43-
path: ./build/package
42+
files: build/SuperZombieFortress-${{ env.PLUGIN_VERSION }}.${{ env.PLUGIN_VERSION_REVISION }}.zip
43+
tag_name: ${{ env.PLUGIN_VERSION }}.${{ env.PLUGIN_VERSION_REVISION }}
44+
generate_release_notes: true

‎README.md‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,10 @@ Plugin originally based off [MekuCube's 1.05 version](https://forums.alliedmods.
1616
- [Mapping](https://github.com/redsunservers/SuperZombieFortress/wiki/Mapping-for-Super-Zombie-Fortress)
1717

1818
## Builds
19-
All builds can be found [here](https://github.com/redsunservers/SuperZombieFortress/actions?query=workflow%3APackage+branch%3Amaster).
20-
To download latest build version, select latest package then "Artifacts" button at top right.
19+
All builds can be found in [releases](https://github.com/redsunservers/SuperZombieFortress/releases) page, auto-built on every commits done in master branch.
2120

2221
# Required Plugin/Extension Dependencies
23-
- SourceMod 1.11
22+
- SourceMod 1.12
2423
- [tf2attributes](https://forums.alliedmods.net/showthread.php?t=210221)
2524
- [tf_econ_data](https://forums.alliedmods.net/showthread.php?t=315011)
2625
- [morecolors](https://forums.alliedmods.net/showthread.php?t=185016) (Only needed if recompiling)

‎addons/sourcemod/configs/szf/classes.cfg‎

Lines changed: 95 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,7 @@
1111
//Zombie and Infected
1212
// regen Health regenerated every second.
1313
// degen Overheal lost every second.
14-
// spree Speed bonus multiplier for amount of zombies killed.
1514
// horde Speed bonus multiplier for amount of zombies in a horde.
16-
// maxspree Maximum speed bonus multiplier for amount of zombies killed.
1715
// maxhorde Maximum speed bonus multiplier for amount of zombies in a horde.
1816
// class Class the player is forced as.
1917
// glow Whenever if infected should always glow.
@@ -29,9 +27,11 @@
2927
// callback_rage Callback to use on rage.
3028
// callback_think Callback to use on every frame.
3129
// callback_touch Callback to use when player touches someone
30+
// callback_damage Callback to use when player takes damage
31+
// callback_attack Callback to use when player deals damage
3232
// callback_death Callback to use on death.
3333
34-
//Below is for "weapon"
34+
//Below is for "weapon", if there are multiple under same weapon slot, only one would be used at random
3535
// index Weapon index.
3636
// attrib Extra attributes to add.
3737
// logname Log name to override as.
@@ -80,7 +80,7 @@
8080
8181
"medic"
8282
{
83-
"regen" "-1"
83+
"regen" "0"
8484
"menu" "Menu_ClassesSurvivorsMedic"
8585
}
8686
@@ -104,11 +104,9 @@
104104
{
105105
"regen" "2"
106106
"degen" "3"
107-
"spree" "1.0"
108107
"horde" "2.0"
109-
"maxspree" "20.0"
110108
"maxhorde" "20.0"
111-
"ragecooldown" "31"
109+
"ragecooldown" "30"
112110
"callback_rage" "Infected_DoGenericRage"
113111
}
114112
@@ -118,6 +116,16 @@
118116
"menu" "Menu_ClassesInfectedScout"
119117
"viewmodel" "models/kirillian/weapons/c_models/c_scout_arms_zombie.mdl"
120118
119+
"weapon"
120+
{
121+
"index" "46" // Bonk! Atomic Punch
122+
}
123+
124+
"weapon"
125+
{
126+
"index" "163" // Crit-a-Cola
127+
}
128+
121129
"weapon"
122130
{
123131
"index" "44" // Sandman
@@ -128,26 +136,37 @@
128136
{
129137
"regen" "1"
130138
"degen" "5"
131-
"spree" "0.8"
132139
"horde" "1.2"
133-
"maxspree" "10.0"
134140
"maxhorde" "10.0"
135141
"menu" "Menu_ClassesInfectedSoldier"
136142
"viewmodel" "models/kirillian/weapons/c_models/c_soldier_arms_zombie.mdl"
137143
138144
"weapon"
139145
{
140-
"index" "128" // Equalizer
146+
"index" "129" // Buff Banner
147+
}
148+
149+
"weapon"
150+
{
151+
"index" "226" // Battalion's Backup
152+
}
153+
154+
"weapon"
155+
{
156+
"index" "354" // Concheror
157+
}
158+
159+
"weapon"
160+
{
161+
"index" "128" // Equalizer
141162
}
142163
}
143164

144165
"pyro"
145166
{
146167
"regen" "1"
147168
"degen" "4"
148-
"spree" "0.8"
149169
"horde" "1.2"
150-
"maxspree" "10.0"
151170
"maxhorde" "10.0"
152171
"menu" "Menu_ClassesInfectedPyro"
153172
"viewmodel" "models/kirillian/weapons/c_models/c_pyro_arms_zombie.mdl"
@@ -163,9 +182,7 @@
163182
{
164183
"regen" "1"
165184
"degen" "4"
166-
"spree" "0.8"
167185
"horde" "1.2"
168-
"maxspree" "10.0"
169186
"maxhorde" "10.0"
170187
"menu" "Menu_ClassesInfectedDemoman"
171188
"viewmodel" "models/kirillian/weapons/c_models/c_demo_arms_zombie.mdl"
@@ -180,13 +197,31 @@
180197
{
181198
"regen" "1"
182199
"degen" "6"
183-
"spree" "0.8"
184200
"horde" "1.2"
185-
"maxspree" "10.0"
186201
"maxhorde" "10.0"
187202
"menu" "Menu_ClassesInfectedHeavy"
188203
"viewmodel" "models/kirillian/weapons/c_models/c_heavy_arms_zombie.mdl"
189204

205+
"weapon"
206+
{
207+
"index" "42" // Sandvich
208+
}
209+
210+
"weapon"
211+
{
212+
"index" "159" // Dalokohs Bar
213+
}
214+
215+
"weapon"
216+
{
217+
"index" "311" // Buffalo Steak Sandvich
218+
}
219+
220+
"weapon"
221+
{
222+
"index" "1190" // Second Banana
223+
}
224+
190225
"weapon"
191226
{
192227
"index" "5" // Fists
@@ -203,11 +238,26 @@
203238
"index" "142" // Gunslinger
204239
"attrib" "81 ; 0.5 ; 343 ; 2.0 ; 344 ; 0.75" // 100 max metal, less fire rate, and range for sentry
205240
}
241+
242+
"weapon"
243+
{
244+
"index" "25" // Construction PDA
245+
}
246+
247+
"weapon"
248+
{
249+
"index" "26" // Destruction PDA
250+
}
251+
252+
"weapon"
253+
{
254+
"index" "28" // Toolbox
255+
}
206256
}
207257

208258
"medic"
209259
{
210-
"regen" "-1"
260+
"regen" "0"
211261
"degen" "4"
212262
"menu" "Menu_ClassesInfectedMedic"
213263
"viewmodel" "models/kirillian/weapons/c_models/c_medic_arms_zombie.mdl"
@@ -223,6 +273,21 @@
223273
"menu" "Menu_ClassesInfectedSniper"
224274
"viewmodel" "models/kirillian/weapons/c_models/c_sniper_arms_zombie.mdl"
225275

276+
"weapon"
277+
{
278+
"index" "57" // Razorback
279+
}
280+
281+
"weapon"
282+
{
283+
"index" "231" // Darwin's Danger Shield
284+
}
285+
286+
"weapon"
287+
{
288+
"index" "642" // Cozy Camper
289+
}
290+
226291
"weapon"
227292
{
228293
"index" "232" // Bushwacka
@@ -265,12 +330,13 @@
265330
"callback_spawn" "Infected_OnTankSpawn"
266331
"callback_rage" "Infected_DoTankThrow"
267332
"callback_think" "Infected_OnTankThink"
333+
"callback_damage" "Infected_OnTankDamage"
268334
"callback_death" "Infected_OnTankDeath"
269335
270336
"weapon"
271337
{
272338
"index" "5" // Fists
273-
"attrib" "107 ; 1.8 ; 236 ; 1.0 ; 329 ; 0.0 ; 405 ; 0.0" // move speed bonus, weapon blocks healing, airblast immunity, vertical airblast immunity
339+
"attrib" "107 ; 2.0 ; 236 ; 1.0 ; 329 ; 0.0 ; 405 ; 0.0" // move speed bonus, weapon blocks healing, airblast immunity, vertical airblast immunity
274340
"logname" "infection_heavy"
275341
"iconname" "infection_heavy"
276342
}
@@ -309,14 +375,16 @@
309375
"viewmodel_anim" "1"
310376
311377
"sound_spawn" "szf/music/bacteria/chargerbacterias.mp3"
312-
"ragecooldown" "16"
378+
"ragecooldown" "15"
313379
"callback_spawn" "Infected_OnChargerSpawn"
314380
"callback_rage" "Infected_DoChargerCharge"
315381
"callback_think" "Infected_OnChargerThink"
382+
"callback_attack" "Infected_OnChargerAttack"
316383
317384
"weapon"
318385
{
319386
"index" "5" // Fists
387+
"attrib" "5 ; 1.4" // Fire rate penalty
320388
"logname" "gloves"
321389
"iconname" "gloves"
322390
}
@@ -330,7 +398,7 @@
330398
"message" "SpecialInfected_Screamer"
331399
"menu" "Menu_ClassesInfectedSpecialScreamer"
332400
"worldmodel" "models/kirillian/infected/benic_v2.mdl"
333-
"ragecooldown" "21"
401+
"ragecooldown" "20"
334402
"callback_rage" "Infected_DoScreamerRage"
335403
"callback_think" "Infected_OnScreamerThink"
336404
@@ -375,7 +443,7 @@
375443
"viewmodel_anim" "1"
376444
377445
"sound_spawn" "szf/music/bacteria/hunterbacterias.mp3"
378-
"ragecooldown" "3"
446+
"ragecooldown" "5"
379447
"callback_rage" "Infected_DoHunterJump"
380448
"callback_think" "Infected_OnHunterThink"
381449
"callback_touch" "Infected_OnHunterTouch"
@@ -392,7 +460,6 @@
392460
"smoker"
393461
{
394462
"class" "sniper"
395-
"health" "-55"
396463
"message" "SpecialInfected_Smoker"
397464
"menu" "Menu_ClassesInfectedSpecialSmoker"
398465
@@ -401,8 +468,11 @@
401468
"viewmodel_anim" "1"
402469
403470
"sound_spawn" "szf/music/bacteria/smokerbacterias.mp3"
404-
"callback_rage" "Infected_DoNoRage"
471+
"ragecooldown" "0"
472+
"callback_rage" "Infected_StartSmokerBeam"
405473
"callback_think" "Infected_OnSmokerThink"
474+
"callback_damage" "Infected_OnSmokerDamage"
475+
"callback_death" "Infected_EndSmokerBeam"
406476
407477
"weapon"
408478
{
@@ -423,7 +493,7 @@
423493
"viewmodel_anim" "1"
424494
425495
"sound_spawn" "szf/music/bacteria/spitterbacterias.mp3"
426-
"ragecooldown" "16"
496+
"ragecooldown" "15"
427497
"callback_rage" "Infected_DoSpitterGas"
428498
"callback_death" "Infected_OnSpitterDeath"
429499
@@ -452,7 +522,7 @@
452522
"viewmodel_anim" "1"
453523
454524
"sound_spawn" "szf/music/bacteria/jockeybacterias.mp3"
455-
"ragecooldown" "6"
525+
"ragecooldown" "5"
456526
"callback_rage" "Infected_DoJockeyJump"
457527
"callback_think" "Infected_OnJockeyThink"
458528
"callback_touch" "Infected_OnJockeyTouch"

‎addons/sourcemod/configs/szf/debris.cfg‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
{
2525
"scale" "2.0"
2626
"angle" "0 270 0"
27-
"chance" "0.01"
27+
"chance" "0.05"
2828
}
2929

3030
"models/soldier_statue/soldier_statue.mdl"
@@ -33,6 +33,6 @@
3333
"offset" "0 -48 0"
3434
"angle" "0 0 -90"
3535
"iconname" "saxxy"
36-
"chance" "0.01"
36+
"chance" "0.05"
3737
}
3838
}

‎addons/sourcemod/configs/szf/reskins.cfg‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,9 @@
6464
//Wrangler
6565
"140" "1086 30668"
6666

67+
//Construction PDA
68+
"25" "737"
69+
6770
//Medic
6871
//Syringe Gun
6972
"17" "204"

0 commit comments

Comments
 (0)