Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix anchor scaling #689

Open
wants to merge 249 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
249 commits
Select commit Hold shift + click to select a range
1a7776c
Wand
jDaivid Dec 26, 2023
1d27eb8
Merge branch 'master' into Magia-workshop
jDaivid Dec 26, 2023
f315ea7
blitz blade IS NOT a magic weapon!
jDaivid Dec 26, 2023
f861c40
Update weapons.cfg
jDaivid Dec 26, 2023
a862b33
raw unfiltered spacing
jDaivid Dec 26, 2023
e8a3e5d
Merge branch 'master' into Magia-workshop
jDaivid Dec 29, 2023
3c1be28
Merge branch 'master' into Magia-workshop
jDaivid Dec 29, 2023
c1175ef
raidhud and wand
jDaivid Dec 29, 2023
7516cd2
a
jDaivid Dec 29, 2023
73a9c91
Merge branch 'master' into Magia-workshop
jDaivid Dec 29, 2023
fe33d62
Merge branch 'master' into Magia-workshop
jDaivid Dec 30, 2023
b959d43
slight early nerf, late buff
jDaivid Dec 30, 2023
e501660
Merge branch 'master' into Magia-workshop
jDaivid Dec 30, 2023
af4555f
redo shower
jDaivid Dec 30, 2023
ca8f404
mage wep stuf
jDaivid Dec 30, 2023
0e55fbb
Merge branch 'master' into Magia-workshop
jDaivid Jan 4, 2024
c57c820
Update weapon_wand_gravaton.sp
jDaivid Jan 4, 2024
f827010
its not a mage weapon but its going in here
jDaivid Jan 5, 2024
3546cb1
tags
jDaivid Jan 5, 2024
9effcde
more fun now
jDaivid Jan 6, 2024
b09ed20
Merge branch 'master' into Magia-workshop
jDaivid Jan 6, 2024
aee1ba8
sanity check
jDaivid Jan 6, 2024
c0d42d5
Update weapons.cfg
artvin01 Jan 6, 2024
cb9a94f
Merge branch 'master' into Magia-workshop
jDaivid Jan 13, 2024
dc146b7
reload stuff
jDaivid Jan 13, 2024
ccbc4f3
Merge branch 'master' into Magia-workshop
jDaivid Jan 18, 2024
b87db33
Merge branch 'master' into Magia-workshop
jDaivid Jan 22, 2024
9fcf094
fix schwert;s existential crisis?
jDaivid Jan 22, 2024
b62d050
a
jDaivid Jan 22, 2024
a515d76
Merge branch 'master' into Magia-workshop
jDaivid Jan 22, 2024
16b2f34
please work
jDaivid Jan 22, 2024
784fd69
a
jDaivid Jan 22, 2024
b643ab2
Update npc_schwertkrieg.sp
jDaivid Jan 22, 2024
97a7eda
Update npc_schwertkrieg.sp
jDaivid Jan 22, 2024
b923e5a
Update npc_schwertkrieg.sp
jDaivid Jan 22, 2024
7e978cb
Merge branch 'master' into Magia-workshop
jDaivid Jan 27, 2024
eb7b8ee
do stuff
jDaivid Jan 27, 2024
09ce4fb
Merge branch 'master' into Magia-workshop
jDaivid Jan 27, 2024
e310a1e
Update weapon_fantasy_blade.sp
jDaivid Jan 27, 2024
5aff4de
a
jDaivid Jan 27, 2024
d387d33
Merge branch 'master' into Magia-workshop
jDaivid Jan 27, 2024
df03601
Update zombieriot.phrases.weapons.description.txt
jDaivid Jan 27, 2024
2b915e9
Merge branch 'master' into Magia-workshop
jDaivid Jan 28, 2024
3c3ea65
do this
jDaivid Jan 28, 2024
1c378a9
Merge branch 'master' into Magia-workshop
jDaivid Feb 15, 2024
de2a952
a
jDaivid Feb 15, 2024
ac658ac
Merge branch 'master' into Magia-workshop
jDaivid Feb 15, 2024
e221dbf
A
jDaivid Feb 15, 2024
caed3ce
and thats that
jDaivid Feb 15, 2024
067d3b6
Merge branch 'master' into Magia-workshop
jDaivid Feb 15, 2024
6882611
fix the fix..
jDaivid Feb 15, 2024
0e3e074
Merge branch 'master' into Magia-workshop
jDaivid Feb 15, 2024
61fff58
future
jDaivid Feb 15, 2024
2abb84a
Merge branch 'master' into Magia-workshop
jDaivid Feb 23, 2024
ac4141f
Merge branch 'master' into Magia-workshop
jDaivid Feb 23, 2024
754ee7d
oh god
jDaivid Feb 23, 2024
e41302a
Merge branch 'master' into Magia-workshop
jDaivid Feb 23, 2024
f631ff0
a
jDaivid Feb 23, 2024
63b8b65
Merge branch 'master' into Magia-workshop
jDaivid Feb 24, 2024
932064b
Merge branch 'master' into Magia-workshop
jDaivid Mar 7, 2024
39d15b7
Update npc_alt_barracks_railgunner.sp
jDaivid Mar 7, 2024
372466b
Merge branch 'master' into Magia-workshop
jDaivid Mar 11, 2024
683dd7f
I hate my old code
jDaivid Mar 11, 2024
fc63d18
a
jDaivid Mar 11, 2024
57697a4
a
jDaivid Mar 11, 2024
ed05d9d
okay
jDaivid Mar 11, 2024
783dba5
angry angry blitz
jDaivid Mar 11, 2024
add4246
god
jDaivid Mar 11, 2024
37e9061
Merge branch 'master' into Magia-workshop
jDaivid Mar 12, 2024
b82d685
long time
jDaivid Mar 12, 2024
7f3776d
this took way longer then expected
jDaivid Mar 12, 2024
0396dc2
a
jDaivid Mar 12, 2024
0dbd587
Merge branch 'master' into Magia-workshop
jDaivid Mar 23, 2024
6a310a6
Merge branch 'master' into new-wep-paps
jDaivid Mar 24, 2024
92f4c8b
stuff
jDaivid Mar 24, 2024
02cf8ba
a
jDaivid Mar 24, 2024
f1d4d99
o shit you too
jDaivid Mar 24, 2024
54d7bbf
Merge branch 'master' into new-wep-paps
jDaivid Mar 24, 2024
388c152
kit
jDaivid Mar 24, 2024
378d07c
a small "few more paps"
jDaivid Mar 24, 2024
0c0c706
freeplay
jDaivid Mar 24, 2024
e8e6741
Merge branch 'master' into new-wep-paps
jDaivid Apr 12, 2024
70fe54b
oopsies
jDaivid Apr 12, 2024
c7bd391
Merge branch 'master' into new-wep-paps
jDaivid Jun 22, 2024
0ba3638
stuff
jDaivid Jun 22, 2024
14f2898
Update npc_alt_barracks_scientific_witchery.sp
jDaivid Jun 22, 2024
bb095e3
Merge branch 'master' into new-wep-paps
jDaivid Jun 27, 2024
65a1913
tickcount stuff
jDaivid Jun 27, 2024
5a93ccd
asd
jDaivid Jun 27, 2024
ec2d55c
Merge branch 'master' into new-wep-paps
jDaivid Jun 28, 2024
b610efe
forgor you used it too
jDaivid Jun 28, 2024
3f7350d
Merge branch 'master' into new-wep-paps
jDaivid Jul 7, 2024
57032ae
hm yes more dmg
jDaivid Jul 7, 2024
7246be2
Merge branch 'master' into new-wep-paps
jDaivid Jul 7, 2024
43a0f99
we love base caster..
jDaivid Jul 7, 2024
83680ae
Merge branch 'master' into new-wep-paps
jDaivid Jul 11, 2024
1c7699f
cosmic :)
jDaivid Jul 11, 2024
48502b8
a
jDaivid Jul 11, 2024
48ebf6a
less
jDaivid Jul 11, 2024
47e1d47
Merge branch 'master' into new-wep-paps
jDaivid Jul 13, 2024
439086a
make it easier to hit stuff
jDaivid Jul 13, 2024
2a94cc2
A
jDaivid Jul 13, 2024
313a586
a
jDaivid Jul 13, 2024
126e41c
a
jDaivid Jul 13, 2024
14c708e
a
jDaivid Jul 13, 2024
6b4efe1
no more overcharging
jDaivid Jul 13, 2024
a883263
Merge branch 'master' into new-wep-paps
jDaivid Jul 14, 2024
3d9931c
idk
jDaivid Jul 14, 2024
d2b8524
Merge branch 'master' into new-wep-paps
jDaivid Jul 15, 2024
dd21ee3
fix blitz kit melee, make quincy homing reliable.
jDaivid Jul 15, 2024
0aa166e
a
jDaivid Jul 15, 2024
d139c52
a
jDaivid Jul 15, 2024
fdb23e6
Merge branch 'master' into new-wep-paps
jDaivid Jul 16, 2024
a9189e3
wave > 60 tweaks
jDaivid Jul 16, 2024
6520dbb
Merge branch 'master' into new-wep-paps
jDaivid Jul 17, 2024
ce8e778
a
jDaivid Jul 17, 2024
0abb544
a
jDaivid Jul 17, 2024
be4264d
Merge branch 'master' into new-wep-paps
jDaivid Jul 20, 2024
48b0588
sieg heil
jDaivid Jul 20, 2024
34e4e55
is done
jDaivid Jul 20, 2024
a0f7c23
HYPER HEIL
jDaivid Jul 20, 2024
4ea4d1d
interesting
jDaivid Jul 20, 2024
b4a2608
a
jDaivid Jul 22, 2024
dbb0af9
Merge branch 'master' into new-wep-paps
jDaivid Jul 22, 2024
a1a5c50
Merge branch 'master' into new-wep-paps
jDaivid Jul 26, 2024
4c756db
a
jDaivid Jul 26, 2024
a268b93
Update weapons.cfg
jDaivid Jul 26, 2024
d2ec151
Update kit_blitzkrieg.sp
jDaivid Jul 26, 2024
3d4a393
Update kit_blitzkrieg.sp
jDaivid Jul 26, 2024
d5db0f1
Merge branch 'master' into new-wep-paps
jDaivid Aug 12, 2024
a2060f4
a
jDaivid Aug 12, 2024
c90095d
so, so many lines
jDaivid Aug 12, 2024
c2ba749
Update npc_twirl.sp
jDaivid Aug 12, 2024
d7ab858
A
jDaivid Aug 12, 2024
1f6522c
Merge branch 'master' into new-wep-paps
jDaivid Aug 12, 2024
cc84a91
Update npc_donnerkrieg.sp
jDaivid Aug 12, 2024
23bb2e2
Merge branch 'master' into new-wep-paps
jDaivid Aug 12, 2024
4c4f5a3
timings
jDaivid Aug 12, 2024
b683ec2
Merge branch 'master' into new-wep-paps
jDaivid Aug 13, 2024
5032af1
Update npc_twirl.sp
jDaivid Aug 13, 2024
1b9a8cd
Merge branch 'master' into new-wep-paps
jDaivid Aug 13, 2024
fb38dff
Update npc_schwertkrieg.sp
jDaivid Aug 13, 2024
8945893
Update npc_schwertkrieg.sp
jDaivid Aug 13, 2024
a3e6775
Update npc_twirl.sp
jDaivid Aug 13, 2024
a2234e9
Update npc_twirl.sp
jDaivid Aug 13, 2024
6bb5e6f
Merge branch 'master' into new-wep-paps
jDaivid Aug 14, 2024
ee9c52f
?
jDaivid Aug 14, 2024
01c824e
Update ruina_npc_enchanced_ai_core.sp
jDaivid Aug 14, 2024
4562c3d
Merge branch 'master' into new-wep-paps
jDaivid Aug 14, 2024
1061d15
a
jDaivid Aug 14, 2024
6f9b320
a
jDaivid Aug 14, 2024
8ac773e
Merge branch 'master' into new-wep-paps
jDaivid Aug 15, 2024
4271aac
Merge branch 'master' into new-wep-paps
jDaivid Aug 18, 2024
1802835
stuff
jDaivid Aug 18, 2024
477b174
a
jDaivid Aug 18, 2024
a7de72f
Update npc_twirl.sp
jDaivid Aug 18, 2024
452a41d
Update npc_ruina_adiantum.sp
jDaivid Aug 18, 2024
cca1d59
Merge branch 'master' into new-wep-paps
jDaivid Aug 22, 2024
d2a7460
oops
jDaivid Aug 22, 2024
634b459
Merge branch 'master' into new-wep-paps
jDaivid Aug 23, 2024
f6da85f
fix it breaking
jDaivid Aug 23, 2024
68fcdf4
Update weapon_yamato.sp
jDaivid Aug 23, 2024
ad3fe6b
Merge branch 'master' into new-wep-paps
jDaivid Aug 23, 2024
bf08288
a
jDaivid Aug 23, 2024
5d2028d
Merge branch 'master' into new-wep-paps
jDaivid Aug 30, 2024
ca2e1f0
tomorrow check the rest
jDaivid Aug 30, 2024
358d5fb
Merge branch 'master' into new-wep-paps
jDaivid Aug 31, 2024
a0f73cb
fix ruina healing npc's not working
jDaivid Aug 31, 2024
ba59037
Merge branch 'master' into new-wep-paps
jDaivid Aug 31, 2024
0f3a018
Merge branch 'master' into new-wep-paps
jDaivid Sep 2, 2024
b19f658
delay
jDaivid Sep 2, 2024
cafbb8f
Merge branch 'master' into new-wep-paps
jDaivid Sep 4, 2024
4931ab5
Update npc_ruina_storm_weaver.sp
jDaivid Sep 4, 2024
8d077fa
a
jDaivid Sep 4, 2024
8664f2d
fix stuff
jDaivid Sep 4, 2024
ff1f013
Update weapon_yamato.sp
jDaivid Sep 4, 2024
5f89569
Merge branch 'master' into new-wep-paps
jDaivid Sep 4, 2024
c1fc661
fix absurd damage resistances
jDaivid Sep 4, 2024
5384533
a
jDaivid Sep 5, 2024
cff29df
Merge branch 'master' into new-wep-paps
jDaivid Sep 5, 2024
38347a8
a
jDaivid Sep 5, 2024
c3dc658
Merge branch 'master' into new-wep-paps
jDaivid Sep 6, 2024
90e74c7
lots of stuff
jDaivid Sep 6, 2024
e2ce4e7
Update ruina_npc_enchanced_ai_core.sp
jDaivid Sep 6, 2024
ac467cc
Update ruina_npc_enchanced_ai_core.sp
jDaivid Sep 6, 2024
f566626
Merge branch 'master' into new-wep-paps
jDaivid Sep 6, 2024
1ec467d
too much of a joke
jDaivid Sep 6, 2024
2efdcbb
Merge branch 'master' into new-wep-paps
jDaivid Sep 6, 2024
830d15e
Merge branch 'master' into new-wep-paps
jDaivid Sep 7, 2024
1af8946
different healing nerf
jDaivid Sep 7, 2024
e5bcbb5
a
jDaivid Sep 7, 2024
aaf9b15
I inverted it, oops
jDaivid Sep 7, 2024
6e120fc
a
jDaivid Sep 8, 2024
767f3ab
a
jDaivid Sep 8, 2024
8517daf
Update npc_twirl.sp
jDaivid Sep 8, 2024
5030f1f
a
jDaivid Sep 8, 2024
45854e8
a
jDaivid Sep 8, 2024
f439cf7
Update ruina_npc_enchanced_ai_core.sp
jDaivid Sep 8, 2024
186cd7d
Update npc_twirl.sp
jDaivid Sep 8, 2024
b9e5f7a
Merge branch 'master' into new-wep-paps
jDaivid Sep 12, 2024
9101ca3
Update npc_alt_barracks_berserker.sp
jDaivid Sep 12, 2024
6a76a79
Merge branch 'master' into new-wep-paps
jDaivid Sep 14, 2024
78f86dd
fixes
jDaivid Sep 14, 2024
8bb5fbb
Merge branch 'master' into new-wep-paps
jDaivid Sep 17, 2024
fa3e5af
stuff
jDaivid Sep 17, 2024
52c49f1
Merge branch 'master' into new-wep-paps
jDaivid Sep 17, 2024
7fd1372
Update npc_ruina_ruliana.sp
jDaivid Sep 17, 2024
43f9a5a
Update ruina_npc_enchanced_ai_core.sp
jDaivid Sep 17, 2024
5395b82
Update ruina_npc_enchanced_ai_core.sp
jDaivid Sep 17, 2024
d888d79
a
jDaivid Sep 18, 2024
18a5edd
Merge branch 'master' into new-wep-paps
jDaivid Sep 18, 2024
db963e5
fix that cursed teleport
jDaivid Sep 18, 2024
dbe1d0f
Update npc_twirl.sp
jDaivid Sep 18, 2024
a93ca75
Merge branch 'master' into new-wep-paps
jDaivid Sep 18, 2024
10ec9a0
barrack changes
jDaivid Sep 18, 2024
1349862
Merge branch 'master' into new-wep-paps
jDaivid Sep 18, 2024
4f1d1d6
Merge branch 'master' into new-wep-paps
jDaivid Sep 22, 2024
ae536b8
blender deeeeeeez
jDaivid Sep 22, 2024
630333b
a
jDaivid Sep 22, 2024
4e81091
Merge branch 'master' into new-wep-paps
jDaivid Sep 23, 2024
df6eadb
wings
jDaivid Sep 23, 2024
3f8617f
Merge branch 'master' into new-wep-paps
jDaivid Sep 24, 2024
fa8c2b6
test later
jDaivid Sep 24, 2024
82336ee
Update magia_cosmetics.sp
jDaivid Sep 24, 2024
77a65d5
Merge branch 'master' into new-wep-paps
jDaivid Sep 24, 2024
6e05b2f
Merge branch 'master' into new-wep-paps
jDaivid Sep 24, 2024
83f210b
a
jDaivid Sep 24, 2024
bcd1df8
Merge branch 'master' into new-wep-paps
jDaivid Sep 26, 2024
8f5b6d6
impact lance
jDaivid Sep 26, 2024
6b5ada1
Merge branch 'master' into new-wep-paps
jDaivid Sep 29, 2024
2759d4d
Merge branch 'master' into new-wep-paps
jDaivid Oct 3, 2024
d9fca47
nerf
jDaivid Oct 3, 2024
09bd25f
retardedme
jDaivid Oct 3, 2024
6640145
Merge branch 'master' into new-wep-paps
jDaivid Oct 4, 2024
cc78257
stuff
jDaivid Oct 4, 2024
d143dd6
Update weapon_ion_beam_wand.sp
jDaivid Oct 4, 2024
cc470bc
Merge branch 'master' into new-wep-paps
jDaivid Oct 9, 2024
1c3da6c
changes
jDaivid Oct 9, 2024
7ee3be6
Update npc_twirl.sp
jDaivid Oct 9, 2024
3bdc5df
Merge branch 'master' into new-wep-paps
jDaivid Oct 13, 2024
69d5af8
fix edge bug, and nerf more
jDaivid Oct 13, 2024
de6ffc5
Merge branch 'master' into new-wep-paps
jDaivid Oct 14, 2024
c599a20
when did they get removed
jDaivid Oct 14, 2024
e23de76
Merge branch 'master' into new-wep-paps
jDaivid Oct 16, 2024
e1afa88
fix translations, and increase value
jDaivid Oct 16, 2024
f09da53
Update npc_ruina_ruliana.sp
jDaivid Oct 16, 2024
29ef92e
Merge branch 'master' into new-wep-paps
jDaivid Oct 19, 2024
74e4717
fix inverted hp anchor drone scaling
jDaivid Oct 19, 2024
780c182
Update npc_ruina_malianius.sp
jDaivid Oct 19, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -568,7 +568,8 @@ static void Spawning_Logic(Magia_Anchor npc)
Ratio=-0.5;
float Time = 1.0 + Ratio;
fl_ruina_battery_timer[npc.index] = GameTime + Time;
int health = RoundToFloor(20000.0/(wave));
float ratio = float(wave)/60.0;
int health = RoundToFloor(30000.0*ratio);
//whats a "switch" statement??
if(wave<=15)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ static void ClotThink(int iNPC)
if(fl_ruina_battery_timer[npc.index]<GameTime)
{
fl_ruina_battery_timer[npc.index]=GameTime+15.0;
if(Zombies_Currently_Still_Ongoing < RoundToFloor(NPC_HARD_LIMIT*0.5))
if(Zombies_Currently_Still_Ongoing < NPC_HARD_LIMIT)
{
Europa_Spawn_Minnions(npc);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ static void ClotThink(int iNPC)
if(fl_ruina_battery_timer[npc.index]<GameTime)
{
fl_ruina_battery_timer[npc.index]=GameTime+15.0;
if(Zombies_Currently_Still_Ongoing < RoundToFloor(NPC_HARD_LIMIT*0.5))
if(Zombies_Currently_Still_Ongoing < NPC_HARD_LIMIT)
{
Europis_Spawn_Minnions(npc);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ static void ClotThink(int iNPC)
if(fl_ruina_battery_timer[npc.index]<GameTime)
{
fl_ruina_battery_timer[npc.index]=GameTime+15.0;
if(Zombies_Currently_Still_Ongoing < RoundToFloor(NPC_HARD_LIMIT*0.5))
if(Zombies_Currently_Still_Ongoing < NPC_HARD_LIMIT)
{
Eurainis_Spawn_Minnions(npc);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ static void ClotThink(int iNPC)
if(fl_ruina_battery_timer[npc.index]<GameTime)
{
fl_ruina_battery_timer[npc.index]=GameTime+15.0;
if(Zombies_Currently_Still_Ongoing < RoundToFloor(NPC_HARD_LIMIT*0.5))
if(Zombies_Currently_Still_Ongoing < NPC_HARD_LIMIT)
{
Euranionis_Spawn_Minnions(npc);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -412,7 +412,7 @@ static void Fire_Random_Ion(Malianius npc)

float Time = 4.0;

ScaleVector(SubjectAbsVelocity, Time);
ScaleVector(SubjectAbsVelocity, 1.0);
AddVectors(vecTarget, SubjectAbsVelocity, Predicted_Pos);

//Ruina_Proper_To_Groud_Clip({24.0,24.0,24.0}, 300.0, Predicted_Pos);
Expand Down