Adding patch notes from git, UI, and loading files from the main install path properly.
Also fixed: * flying wands not pathing properly. * Lantern particles offset * Wand fire offset * Water spray from flask
This commit is contained in:
1 parent
06bb712a46
commit
9bb9797271
19 files changed
+1569
-134
No files matched your search
+10
-3
@@ -45,6 +45,8 @@ layout(std430, set = 0, binding = 23) buffer Ctrl {
|
||||
ivec4 hand1; // host: held wand: texel offset, w, h
|
||||
vec4 hand2; // host: held wand: pivot
|
||||
ivec4 burnN; // rigid_burn.comp: x the burnt pixels; y: the player's respawns, z: saved by SAVING_GRACE, w: an extra life used (the host reads and clears them)
|
||||
ivec4 burnEv[256]; ivec4 reactN; ivec4 reactEv[64];
|
||||
ivec4 extra; // host: x = 1: a dead player stays dead where it fell (the game over of the menus) instead of respawning
|
||||
} ctrl;
|
||||
#include "hit_liquid.glsl"
|
||||
|
||||
@@ -303,9 +305,14 @@ void main() {
|
||||
if (hp <= 0.0 && (e.ex8.x & 16) != 0 && hpBeforeHit > 0.04) { hp = 0.04; atomicAdd(ctrl.burnN.z, 1); }
|
||||
else if (hp <= 0.0 && (ents[id].ex8.x & 131072) != 0) { hp = min(4.0, e.aux.x > 0 ? float(e.aux.x) * 0.001 : 4.0); atomicAnd(ents[id].ex8.x, ~131072); atomicAdd(ctrl.burnN.w, 1); }
|
||||
if (hp <= 0.0 && (e.ex8.x & 32768) == 0) { // respawn at the spawn point (a polymorphed body is not: the host ends the polymorph, 32768)
|
||||
pos = vec2(float(e.x.z), float(e.x.w)); vel = vec2(0.0); ip = ivec2(floor(pos));
|
||||
hp = e.aux.x > 0 ? float(e.aux.x) * 0.001 : 4.0;
|
||||
atomicAdd(ctrl.burnN.y, 1);
|
||||
if (ctrl.extra.x != 0) { // the game over (menu.h): the body stays where it fell, dead - no controls, counted once for the host
|
||||
if ((flags & ST_DEAD) == 0) atomicAdd(ctrl.burnN.y, 1);
|
||||
flags |= ST_DEAD; hp = 0.0; target = 0.0; want_jump = false; thrust = false;
|
||||
} else {
|
||||
pos = vec2(float(e.x.z), float(e.x.w)); vel = vec2(0.0); ip = ivec2(floor(pos));
|
||||
hp = e.aux.x > 0 ? float(e.aux.x) * 0.001 : 4.0;
|
||||
atomicAdd(ctrl.burnN.y, 1);
|
||||
}
|
||||
}
|
||||
} else if (kind == 1 || kind == 2) { // ---- creatures ----
|
||||
// the target of the creature: the player; a charmed creature (game effect CHARM) fights the nearest creature of another herd instead
|
||||
|
||||
Reference in new issue
Block a user