X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fmutators%2Fsandbox.qc;h=66377d1d84aade6398814d045f04926cefdc7d17;hb=49af10f3413b96e52055359d42288dbf5ec6972b;hp=6514dccba7d312a90647e9b4e1909b30c7bcd210;hpb=6f6a9d3ce8a4fd3c10f7421ba27e4bfc944c8f9b;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/mutators/sandbox.qc b/qcsrc/server/mutators/sandbox.qc index 6514dccba..94ba20f10 100644 --- a/qcsrc/server/mutators/sandbox.qc +++ b/qcsrc/server/mutators/sandbox.qc @@ -26,7 +26,7 @@ void sandbox_ObjectFunction_Touch() intensity -= autocvar_g_sandbox_object_material_velocity_min; // start from minimum velocity, not actual velocity intensity = bound(0, intensity * autocvar_g_sandbox_object_material_velocity_factor, 1); - sound(self, CH_TRIGGER, strcat("object/impact_", self.material, "_", ftos(ceil(random() * 5)) , ".ogg"), VOL_BASE * intensity, ATTN_NORM); + sound(self, CH_TRIGGER, strcat("object/impact_", self.material, "_", ftos(ceil(random() * 5)) , ".wav"), VOL_BASE * intensity, ATTEN_NORM); pointparticles(particleeffectnum(strcat("impact_", self.material)), self.origin, '0 0 0', ceil(intensity * 10)); // allow a count from 1 to 10 } @@ -58,20 +58,21 @@ void sandbox_ObjectFunction_Think() self.nextthink = time; } +.float old_solid, old_movetype; entity sandbox_ObjectEdit_Get(float permissions) { - // returns the traced entity if the player can edit it, and world if not - // if permissions if FALSE, the object is returned regardless of editing rights - // attached objects are SOLID_NOT and don't risk getting traced - - makevectors(self.v_angle); - WarpZone_TraceLine(self.origin + self.view_ofs, self.origin + self.view_ofs + v_forward * autocvar_g_sandbox_editor_distance_edit, MOVE_NORMAL, self); + // Returns the traced entity if the player can edit it, and world if not. + // If permissions if FALSE, the object is returned regardless of editing rights. + // Attached objects are SOLID_NOT and do not get traced. + crosshair_trace_plusvisibletriggers(self); + if(vlen(self.origin - trace_ent.origin) > autocvar_g_sandbox_editor_distance_edit) + return world; // out of trace range if(trace_ent.classname != "object") return world; // entity is not an object if(!permissions) return trace_ent; // don't check permissions, anyone can edit this object - if(!trace_ent.crypto_idfp) + if(trace_ent.crypto_idfp == "") return trace_ent; // the player who spawned this object did not have an UID, so anyone can edit it if not(trace_ent.realowner != self && autocvar_g_sandbox_editor_free < 2) return trace_ent; // object does not belong to the player, and players can only edit their own objects on this server @@ -89,7 +90,6 @@ void sandbox_ObjectEdit_Scale(entity e, float f) } } -.float old_movetype; void sandbox_ObjectAttach_Remove(entity e); void sandbox_ObjectAttach_Set(entity e, entity parent, string s) { @@ -98,6 +98,7 @@ void sandbox_ObjectAttach_Set(entity e, entity parent, string s) // we can't attach to an attachment, for obvious reasons sandbox_ObjectAttach_Remove(e); + e.old_solid = e.solid; // persist solidity e.old_movetype = e.movetype; // persist physics e.movetype = MOVETYPE_FOLLOW; e.solid = SOLID_NOT; @@ -117,10 +118,6 @@ void sandbox_ObjectAttach_Remove(entity e) if(head.owner == e) { vector org; - head.movetype = head.old_movetype; // restore persisted physics - head.solid = SOLID_BBOX; - head.takedamage = DAMAGE_AIM; - org = gettaginfo(head, 0); setattachment(head, world, ""); head.owner = world; @@ -128,6 +125,10 @@ void sandbox_ObjectAttach_Remove(entity e) // objects change origin and angles when detached, so apply previous position setorigin(head, org); head.angles = e.angles; // don't allow detached objects to spin or roll + + head.solid = head.old_solid; // restore persisted solidity + head.movetype = head.old_movetype; // restore persisted physics + head.takedamage = DAMAGE_AIM; } } } @@ -180,6 +181,14 @@ void sandbox_ObjectRemove(entity e) { sandbox_ObjectAttach_Remove(e); // detach child objects + // if the object being removed has been selected for attachment by a player, unset it + entity head; + FOR_EACH_REALPLAYER(head) // bots can't have objects + { + if(head.object_attach == e) + head.object_attach = world; + } + if(e.material) { strunzone(e.material); e.material = string_null; } if(e.crypto_idfp) { strunzone(e.crypto_idfp); e.crypto_idfp = string_null; } if(e.netname) { strunzone(e.netname); e.netname = string_null; } @@ -196,23 +205,25 @@ string port_string[MAX_STORAGE_ATTACHMENTS]; // fteqcc crashes if this isn't def string sandbox_ObjectPort_Save(entity e, float database) { // save object properties, and return them as a string - float i; + float i = 0; string s; entity head; for(head = world; (head = find(head, classname, "object")); ) { // the main object needs to be first in the array [0] with attached objects following - float slot, physics; + float slot, physics, solidity; if(head == e) // this is the main object, place it first { slot = 0; + solidity = head.solid; // applied solidity is normal solidity for children physics = head.movetype; // applied physics are normal physics for parents } else if(head.owner == e) // child object, list them in order { i += 1; // children start from 1 slot = i; + solidity = head.old_solid; // persisted solidity is normal solidity for children physics = head.old_movetype; // persisted physics are normal physics for children gettaginfo(head.owner, head.tag_index); // get the name of the tag our object is attached to, used further below } @@ -223,7 +234,7 @@ string sandbox_ObjectPort_Save(entity e, float database) if(slot) { // properties stored only for child objects - if(gettaginfo_name) port_string[slot] = strcat(port_string[slot], "\"", gettaginfo_name, "\" "); else port_string[slot] = strcat(port_string[slot], "- "); // none + if(gettaginfo_name) port_string[slot] = strcat(port_string[slot], "\"", gettaginfo_name, "\" "); else port_string[slot] = strcat(port_string[slot], "\"\" "); // none } else { @@ -242,13 +253,14 @@ string sandbox_ObjectPort_Save(entity e, float database) port_string[slot] = strcat(port_string[slot], sprintf("\"%.9v\"", head.glowmod), " "); port_string[slot] = strcat(port_string[slot], ftos(head.frame), " "); port_string[slot] = strcat(port_string[slot], ftos(head.scale), " "); + port_string[slot] = strcat(port_string[slot], ftos(solidity), " "); port_string[slot] = strcat(port_string[slot], ftos(physics), " "); port_string[slot] = strcat(port_string[slot], ftos(head.damageforcescale), " "); - if(head.material) port_string[slot] = strcat(port_string[slot], "\"", head.material, "\" "); else port_string[slot] = strcat(port_string[slot], "- "); // none + if(head.material) port_string[slot] = strcat(port_string[slot], "\"", head.material, "\" "); else port_string[slot] = strcat(port_string[slot], "\"\" "); // none if(database) { // properties stored only for the database - if(head.crypto_idfp) port_string[slot] = strcat(port_string[slot], "\"", head.crypto_idfp, "\" "); else port_string[slot] = strcat(port_string[slot], "- "); // none + if(head.crypto_idfp) port_string[slot] = strcat(port_string[slot], "\"", head.crypto_idfp, "\" "); else port_string[slot] = strcat(port_string[slot], "\"\" "); // none port_string[slot] = strcat(port_string[slot], "\"", e.netname, "\" "); port_string[slot] = strcat(port_string[slot], "\"", e.message, "\" "); port_string[slot] = strcat(port_string[slot], "\"", e.message2, "\" "); @@ -256,6 +268,7 @@ string sandbox_ObjectPort_Save(entity e, float database) } // now apply the array to a simple string, with the ; symbol separating objects + s = ""; for(i = 0; i <= MAX_STORAGE_ATTACHMENTS; ++i) { if(port_string[i]) @@ -270,7 +283,7 @@ entity sandbox_ObjectPort_Load(string s, float database) { // load object properties, and spawn a new object with them float n, i; - entity e, parent; + entity e = world, parent = world; // separate objects between the ; symbols n = tokenizebyseparator(s, "; "); @@ -281,7 +294,7 @@ entity sandbox_ObjectPort_Load(string s, float database) for(i = 0; i < n; ++i) { float argv_num; - string tagname; + string tagname = string_null; argv_num = 0; tokenize_console(port_string[i]); e = sandbox_ObjectSpawn(database); @@ -290,7 +303,7 @@ entity sandbox_ObjectPort_Load(string s, float database) if(i) { // properties stored only for child objects - if(argv(argv_num) != "-") tagname = argv(argv_num); else tagname = string_null; ++argv_num; + if(argv(argv_num) != "") tagname = argv(argv_num); else tagname = string_null; ++argv_num; } else { @@ -310,13 +323,14 @@ entity sandbox_ObjectPort_Load(string s, float database) e.glowmod = stov(argv(argv_num)); ++argv_num; e.frame = stof(argv(argv_num)); ++argv_num; sandbox_ObjectEdit_Scale(e, stof(argv(argv_num))); ++argv_num; + e.solid = e.old_solid = stof(argv(argv_num)); ++argv_num; e.movetype = e.old_movetype = stof(argv(argv_num)); ++argv_num; e.damageforcescale = stof(argv(argv_num)); ++argv_num; - if(e.material) strunzone(e.material); if(argv(argv_num) != "-") e.material = strzone(argv(argv_num)); else e.material = string_null; ++argv_num; + if(e.material) strunzone(e.material); if(argv(argv_num) != "") e.material = strzone(argv(argv_num)); else e.material = string_null; ++argv_num; if(database) { // properties stored only for the database - if(e.crypto_idfp) strunzone(e.crypto_idfp); if(argv(argv_num) != "-") e.crypto_idfp = strzone(argv(argv_num)); else e.crypto_idfp = string_null; ++argv_num; + if(e.crypto_idfp) strunzone(e.crypto_idfp); if(argv(argv_num) != "") e.crypto_idfp = strzone(argv(argv_num)); else e.crypto_idfp = string_null; ++argv_num; if(e.netname) strunzone(e.netname); e.netname = strzone(argv(argv_num)); ++argv_num; if(e.message) strunzone(e.message); e.message = strzone(argv(argv_num)); ++argv_num; if(e.message2) strunzone(e.message2); e.message2 = strzone(argv(argv_num)); ++argv_num; @@ -375,7 +389,7 @@ void sandbox_Database_Load() for(;;) { file_read = fgets(file_get); - if(!file_read) + if(file_read == "") break; if(substring(file_read, 0, 2) == "//") continue; @@ -389,7 +403,7 @@ void sandbox_Database_Load() { // since objects are being loaded for the first time, precache material sounds for each for (i = 1; i <= 5; i++) // 5 sounds in total - precache_sound(strcat("object/impact_", e.material, "_", ftos(i), ".ogg")); + precache_sound(strcat("object/impact_", e.material, "_", ftos(i), ".wav")); } } if(autocvar_g_sandbox_info > 0) @@ -440,6 +454,7 @@ MUTATOR_HOOKFUNCTION(sandbox_PlayerCommand) print_to(self, "^3glowmod \"value_x value_y value_z\" ^7- glow object color"); print_to(self, "^3frame value ^7- object animation frame, for self-animated models"); print_to(self, "^3scale value ^7- changes object scale. 0.5 is half size and 2 is double size"); + print_to(self, "^3solidity value ^7- object collisions, 0 = non-solid, 1 = solid"); print_to(self, "^3physics value ^7- object physics, 0 = static, 1 = movable, 2 = physical"); print_to(self, "^3force value ^7- amount of force applied to objects that are shot"); print_to(self, "^3material value ^7- sets the material of the object. Default materials are: metal, stone, wood, flesh"); @@ -523,7 +538,7 @@ MUTATOR_HOOKFUNCTION(sandbox_PlayerCommand) return TRUE; } self.object_flood = time + autocvar_g_sandbox_editor_flood; - if(!argv(3)) // no object in clipboard + if(argv(3) == "") // no object in clipboard { print_to(self, "^1SANDBOX - WARNING: ^7No object in clipboard. You must copy an object before you can paste it"); return TRUE; @@ -595,7 +610,7 @@ MUTATOR_HOOKFUNCTION(sandbox_PlayerCommand) // ---------------- COMMAND: OBJECT, EDIT ---------------- case "object_edit": - if(!argv(2)) + if(argv(2) == "") { print_to(self, "^1SANDBOX - WARNING: ^7Too few parameters. You must specify a property to edit"); return TRUE; @@ -624,6 +639,18 @@ MUTATOR_HOOKFUNCTION(sandbox_PlayerCommand) case "scale": sandbox_ObjectEdit_Scale(e, stof(argv(3))); break; + case "solidity": + switch(argv(3)) + { + case "0": // non-solid + e.solid = SOLID_TRIGGER; + break; + case "1": // solid + e.solid = SOLID_BBOX; + break; + default: + break; + } case "physics": switch(argv(3)) { @@ -648,7 +675,7 @@ MUTATOR_HOOKFUNCTION(sandbox_PlayerCommand) if(argv(3)) { for (i = 1; i <= 5; i++) // precache material sounds, 5 in total - precache_sound(strcat("object/impact_", argv(3), "_", ftos(i), ".ogg")); + precache_sound(strcat("object/impact_", argv(3), "_", ftos(i), ".wav")); e.material = strzone(argv(3)); } else @@ -718,13 +745,16 @@ MUTATOR_HOOKFUNCTION(sandbox_PlayerCommand) print_to(self, strcat("^2SANDBOX - INFO: ^7Object is owned by \"^7", e.netname, "^7\", created \"^3", e.message, "^7\", last edited \"^3", e.message2, "^7\"")); return TRUE; case "mesh": - for(i = 1; gettaginfo(e, i); i++) + s = ""; + FOR_EACH_TAG(e) s = strcat(s, "^7\"^5", gettaginfo_name, "^7\", "); print_to(self, strcat("^2SANDBOX - INFO: ^7Object mesh is \"^3", e.model, "^7\" at animation frame ^3", ftos(e.frame), " ^7containing the following tags: ", s)); return TRUE; case "attachments": // this should show the same info as 'mesh' but for attachments + s = ""; entity head; + i = 0; for(head = world; (head = find(head, classname, "object")); ) { if(head.owner == e) @@ -768,10 +798,17 @@ MUTATOR_HOOKFUNCTION(sandbox_StartFrame) return TRUE; } +MUTATOR_HOOKFUNCTION(sandbox_SetModname) +{ + modname = "Sandbox"; + return TRUE; +} + MUTATOR_DEFINITION(sandbox) { MUTATOR_HOOK(SV_ParseClientCommand, sandbox_PlayerCommand, CBC_ORDER_ANY); MUTATOR_HOOK(SV_StartFrame, sandbox_StartFrame, CBC_ORDER_ANY); + MUTATOR_HOOK(SetModname, sandbox_SetModname, CBC_ORDER_ANY); MUTATOR_ONADD { @@ -780,6 +817,16 @@ MUTATOR_DEFINITION(sandbox) sandbox_Database_Load(); } + MUTATOR_ONROLLBACK_OR_REMOVE + { + // nothing to roll back + } + + MUTATOR_ONREMOVE + { + // nothing to remove + } + return FALSE; }