X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fmutators%2Fsandbox.qc;h=9afe34ffb3c09ccd3a8270c744d30b9f44398e68;hb=25bec571007cb22ae00c9c45dcfd4f6cbdc01428;hp=ca1d96029c2f9b2a1ec8370ce20ef3c7c9f40246;hpb=08c71a3e55db235ce99d5a884e178e7439e6e8de;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/mutators/sandbox.qc b/qcsrc/server/mutators/sandbox.qc index ca1d96029..9afe34ffb 100644 --- a/qcsrc/server/mutators/sandbox.qc +++ b/qcsrc/server/mutators/sandbox.qc @@ -1,7 +1,52 @@ -.string clipboard_model; -.float clipboard_movetype; +.string object_clipboard; +.float material; -entity sandbox_EditObject() +const float MATERIAL_NONE = 0; +const float MATERIAL_METAL = 1; +const float MATERIAL_STONE = 2; +const float MATERIAL_WOOD = 3; +const float MATERIAL_FLESH = 4; + +.float touch_timer; +void sandbox_Object_Touch() +{ + // apply material impact effects + + if(self.touch_timer > time) + return; // don't execute each frame + self.touch_timer = time + 0.1; + if not(vlen(self.velocity) > autocvar_g_sandbox_object_material_velocity_min || vlen(other.velocity) > autocvar_g_sandbox_object_material_velocity_min) + return; // impact not strong enough + + // make particle count and sound intensity depend on impact speed + float intensity; + intensity = (vlen(self.velocity) + vlen(other.velocity)) / 2; + intensity = bound(0, intensity * autocvar_g_sandbox_object_material_velocity_factor, 1); + + switch(self.material) + { + case MATERIAL_METAL: + sound(self, CH_TRIGGER, strcat("object/impact_metal_", ftos(ceil(random() * 5)) , ".ogg"), VOL_BASE * intensity, ATTN_NORM); + pointparticles(particleeffectnum("impact_metal"), self.origin, '0 0 0', ceil(intensity * 10)); // allow a count from 1 to 10 + break; + case MATERIAL_STONE: + sound(self, CH_TRIGGER, strcat("object/impact_stone_", ftos(ceil(random() * 5)) , ".ogg"), VOL_BASE * intensity, ATTN_NORM); + pointparticles(particleeffectnum("impact_stone"), self.origin, '0 0 0', ceil(intensity * 10)); // allow a count from 1 to 10 + break; + case MATERIAL_WOOD: + sound(self, CH_TRIGGER, strcat("object/impact_wood_", ftos(ceil(random() * 5)) , ".ogg"), VOL_BASE * intensity, ATTN_NORM); + pointparticles(particleeffectnum("impact_wood"), self.origin, '0 0 0', ceil(intensity * 10)); // allow a count from 1 to 10 + break; + case MATERIAL_FLESH: + sound(self, CH_TRIGGER, strcat("object/impact_flesh_", ftos(ceil(random() * 5)) , ".ogg"), VOL_BASE * intensity, ATTN_NORM); + pointparticles(particleeffectnum("impact_flesh"), self.origin, '0 0 0', ceil(intensity * 10)); // allow a count from 1 to 10 + break; + default: + break; + } +} + +entity sandbox_EditObject_Get() { // returns the traced entity if the player can edit it, and world if not @@ -13,6 +58,16 @@ entity sandbox_EditObject() return world; } +void sandbox_EditObject_Scale(entity e, float f) +{ + e.scale = f; + if(e.scale) + { + e.scale = bound(autocvar_g_sandbox_object_scale_min, e.scale, autocvar_g_sandbox_object_scale_max); + setsize(e, e.mins * e.scale, e.maxs * e.scale); // adapt bounding box size to model size + } +} + entity sandbox_SpawnObject() { // spawn a new object with default properties @@ -21,9 +76,15 @@ entity sandbox_SpawnObject() e = spawn(); e.realowner = self; e.classname = "object"; - e.takedamage = DAMAGE_NO; + e.takedamage = DAMAGE_AIM; + e.damageforcescale = 1; + e.solid = SOLID_BBOX; // SOLID_BSP would be best, but can lag the server badly e.movetype = MOVETYPE_TOSS; - e.solid = SOLID_BSP; + e.frame = 0; + e.skin = 0; + e.material = MATERIAL_NONE; + + e.touch = sandbox_Object_Touch; // set origin and direction based on player position and view angle makevectors(self.v_angle); @@ -34,6 +95,42 @@ entity sandbox_SpawnObject() return e; } +string sandbox_Storage_Save(entity e) +{ + // save object properties + string s; + + s = strcat(e.model, " "); + s = strcat(s, ftos(e.skin), " "); + s = strcat(s, ftos(e.alpha), " "); + s = strcat(s, sprintf("\"%.9v\"", e.colormod), " "); + s = strcat(s, sprintf("\"%.9v\"", e.glowmod), " "); + s = strcat(s, ftos(e.frame), " "); + s = strcat(s, ftos(e.scale), " "); + s = strcat(s, ftos(e.movetype), " "); + s = strcat(s, ftos(e.damageforcescale), " "); + s = strcat(s, ftos(e.material), " "); + + return s; +} + +void sandbox_Storage_Load(entity e, string s) +{ + // load object properties + tokenize_console(s); + + setmodel(e, argv(0)); + e.skin = stof(argv(1)); + e.alpha = stof(argv(2)); + e.colormod = stov(argv(3)); + e.glowmod = stov(argv(4)); + e.frame = stof(argv(5)); + sandbox_EditObject_Scale(e, stof(argv(6))); + e.movetype = stof(argv(7)); + e.damageforcescale = stof(argv(8)); + e.material = stof(argv(9)); +} + MUTATOR_HOOKFUNCTION(sandbox_PlayerCommand) { if(MUTATOR_RETURNVALUE) // command was already handled? @@ -46,131 +143,204 @@ MUTATOR_HOOKFUNCTION(sandbox_PlayerCommand) return TRUE; } - entity e; - if(argv(1) == "help") - { - print_to(self, "You can use the following sandbox commands:"); - print_to(self, "^7\"^2spawn_item ^3item^7\" spawns the specified item in front of the player. Only weapons are currently supported"); - print_to(self, "^7\"^2spawn_object ^3models/foo/bar.md3^7\" spawns a new object in front of the player, and gives it the specified model"); - print_to(self, "^7\"^2remove_object^7\" removes the object the player is looking at. Players can only remove their own objects"); - print_to(self, "^7\"^2duplicate_object_copy^7\" copies the object the player is looking at. Players can only copy their own objects"); - print_to(self, "^7\"^2duplicate_object_paste^7\" pastes the copied object in front of the player"); - print_to(self, "^7The ^1drag object ^7key can be used to grab and carry objects. Players can only grab their own objects"); - return TRUE; - } - else if(argv(1) == "spawn_item") + switch(argv(1)) { - // only weapons are currently supported - - if(cmd_argc < 3) - { - print_to(self, "WARNING: Attempted to spawn an item without specifying its type. Please specify the name of your item after the 'spawn_item' command"); + entity e; + + // ---------------- COMMAND: HELP ---------------- + case "help": + print_to(self, "You can use the following sandbox commands:"); + print_to(self, "^7\"^2spawn_item ^3item^7\" spawns the specified item in front of the player. Only weapons are currently supported"); + print_to(self, "^7\"^2spawn_object ^3models/foo/bar.md3^7\" spawns a new object in front of the player, and gives it the specified model"); + print_to(self, "^7\"^2remove_object^7\" removes the object the player is looking at. Players can only remove their own objects"); + print_to(self, "^7\"^2duplicate_object_copy^7\" copies the object the player is looking at. Players can only copy their own objects"); + print_to(self, "^7\"^2duplicate_object_paste^7\" pastes the copied object in front of the player"); + print_to(self, "^7\"^2edit_object ^3property value^7\" edits the given property of the object. Players can only edit their own objects"); + print_to(self, "^7Object properties for ^2edit_object^7:"); + print_to(self, "^3skin value ^7- changes the skin of the object"); + print_to(self, "^3alpha value ^7- sets object transparency"); + print_to(self, "^3colormod \"value_x value_y value_z\" ^7- main object color"); + 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, "^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. Valid materials are: 1 (metal), 2 (stone), 3 (wood), 4 (flesh)"); + print_to(self, "^7The ^1drag object ^7key can be used to grab and carry objects. Players can only grab their own objects"); return TRUE; - } - // spawn a new item - float i; - makevectors(self.v_angle); - WarpZone_TraceLine(self.origin + self.view_ofs, self.origin + self.view_ofs + v_forward * autocvar_g_sandbox_editor_distance_spawn, MOVE_NOMONSTERS, self); + // ---------------- COMMAND: SPAWN ITEM ---------------- + case "spawn_item": + // only weapons are currently supported - for(i = WEP_FIRST; i <= WEP_LAST; ++i) - { - e = get_weaponinfo(i); - if(e.netname == argv(2)) + if(cmd_argc < 3) { - W_ThrowNewWeapon(self, i, FALSE, trace_endpos, '0 0 0'); - if(autocvar_g_sandbox_info) - print(strcat(self.netname, " spawned a ^2", e.netname, "^7 at origin ", vtos(e.origin), "\n")); + print_to(self, "WARNING: Attempted to spawn an item without specifying its type. Please specify the name of your item after the 'spawn_item' command"); return TRUE; } - } - print_to(self, "WARNING: Attempted to spawn an invalid or unsupported item. See 'sandbox help' for allowed items"); - return TRUE; - } - else if(argv(1) == "spawn_object") - { - // don't allow spawning objects without a model - if(cmd_argc < 3) - { - print_to(self, "WARNING: Attempted to spawn an object without specifying a model. Please specify the path to your model file after the 'spawn_object' command"); - return TRUE; - } - else if not(fexists(argv(2))) - { - print_to(self, "WARNING: Attempted to spawn an object with a non-existent model. Make sure the path to your model file is correct"); + // spawn a new item + float i; + makevectors(self.v_angle); + WarpZone_TraceLine(self.origin + self.view_ofs, self.origin + self.view_ofs + v_forward * autocvar_g_sandbox_editor_distance_spawn, MOVE_NOMONSTERS, self); + + for(i = WEP_FIRST; i <= WEP_LAST; ++i) + { + e = get_weaponinfo(i); + if(e.netname == argv(2)) + { + W_ThrowNewWeapon(self, i, FALSE, trace_endpos, '0 0 0'); + if(autocvar_g_sandbox_info) + print(strcat(self.netname, " spawned a ^2", e.netname, "^7 at origin ", vtos(e.origin), "\n")); + return TRUE; + } + } + + print_to(self, "WARNING: Attempted to spawn an invalid or unsupported item. See 'sandbox help' for allowed items"); return TRUE; - } - e = sandbox_SpawnObject(); - setmodel(e, argv(2)); + // ---------------- COMMAND: SPAWN OBJECT ---------------- + case "spawn_object": + // don't allow spawning objects without a model + if(cmd_argc < 3) + { + print_to(self, "WARNING: Attempted to spawn an object without specifying a model. Please specify the path to your model file after the 'spawn_object' command"); + return TRUE; + } + else if not(fexists(argv(2))) + { + print_to(self, "WARNING: Attempted to spawn an object with a non-existent model. Make sure the path to your model file is correct"); + return TRUE; + } - if(autocvar_g_sandbox_info) - print(strcat(self.netname, " spawned an object at origin ", vtos(e.origin), "\n")); + e = sandbox_SpawnObject(); + setmodel(e, argv(2)); - return TRUE; - } - else if(argv(1) == "remove_object") - { - e = sandbox_EditObject(); - if(e != world) - { if(autocvar_g_sandbox_info) - print(strcat(self.netname, " removed an object at origin ", vtos(e.origin), "\n")); - remove(e); - e = world; + print(strcat(self.netname, " spawned an object at origin ", vtos(e.origin), "\n")); + return TRUE; - } - print_to(self, "WARNING: Object could not be removed. Make sure you are facing an object that belongs to you"); - return TRUE; - } - else if(argv(1) == "duplicate_object_copy") - { - // copies customizable properties of the selected object to the clipboard + // ---------------- COMMAND: REMOVE OBJECT ---------------- + case "remove_object": + e = sandbox_EditObject_Get(); + if(e != world) + { + if(autocvar_g_sandbox_info) + print(strcat(self.netname, " removed an object at origin ", vtos(e.origin), "\n")); + remove(e); + e = world; + return TRUE; + } + + print_to(self, "WARNING: Object could not be removed. Make sure you are facing an object that belongs to you"); + return TRUE; + + // ---------------- COMMAND: DUPLICATE OBJECT COPY ---------------- + case "duplicate_object_copy": + // copies customizable properties of the selected object to the clipboard - e = sandbox_EditObject(); // you can only copy objects you can edit, so this works - if(e != world) - { - // -------- COPY PROPERTIES -------- - self.clipboard_model = e.model; - self.clipboard_movetype = e.movetype; - // -------- COPY PROPERTIES -------- + e = sandbox_EditObject_Get(); // you can only copy objects you can edit, so this works + if(e != world) + { + if(self.object_clipboard) + strunzone(self.object_clipboard); + self.object_clipboard = strzone(sandbox_Storage_Save(e)); + + print_to(self, "Object copied to clipboard"); + return TRUE; + } - print_to(self, "Object copied to clipboard"); + print_to(self, "WARNING: Object could not be copied. Make sure you are facing an object that belongs to you"); return TRUE; - } - print_to(self, "WARNING: Object could not be copied. Make sure you are facing an object that belongs to you"); - return TRUE; - } - else if(argv(1) == "duplicate_object_paste") - { - // spawns a new object using the properties in the player's clipboard + // ---------------- COMMAND: DUPLICATE OBJECT PASTE ---------------- + case "duplicate_object_paste": + // spawns a new object using the properties in the player's clipboard + + if(!self.object_clipboard) // no object in clipboard + { + print_to(self, "WARNING: No object in clipboard. You must copy an object before you can paste it"); + return TRUE; + } + + e = sandbox_SpawnObject(); + sandbox_Storage_Load(e, self.object_clipboard); + + print_to(self, "Object pasted"); + if(autocvar_g_sandbox_info) + print(strcat(self.netname, " pasted an object at origin ", vtos(e.origin), "\n")); - if(self.clipboard_model == "") // no object in clipboard - { - print_to(self, "WARNING: No object in clipboard. You must copy an object before you can paste it"); return TRUE; - } - e = sandbox_SpawnObject(); + // ---------------- COMMAND: EDIT OBJECT ---------------- + case "edit_object": + if(!argv(2) || !argv(3)) + { + print_to(self, "WARNING: Too few parameters. You must specify a property to edit, followed by its value"); + return TRUE; + } - // -------- PASTE PROPERTIES -------- - setmodel(e, self.clipboard_model); - e.movetype = self.clipboard_movetype; - // -------- PASTE PROPERTIES -------- + e = sandbox_EditObject_Get(); + if(e != world) + { + switch(argv(2)) + { + case "skin": + e.skin = stof(argv(3)); + break; + case "alpha": + e.alpha = stof(argv(3)); + break; + case "color_main": + e.colormod = stov(argv(3)); + break; + case "color_glow": + e.glowmod = stov(argv(3)); + break; + case "frame": + e.frame = stof(argv(3)); + break; + case "scale": + sandbox_EditObject_Scale(e, stof(argv(3))); + break; + case "physics": + switch(argv(3)) + { + case "0": // static + e.movetype = MOVETYPE_NONE; + break; + case "1": // movable + e.movetype = MOVETYPE_TOSS; + break; + case "2": // physical + e.movetype = MOVETYPE_PHYSICS; + break; + default: + break; + } + break; + case "force": + e.damageforcescale = stof(argv(3)); + break; + case "material": + e.material = stof(argv(3)); + break; + default: + print_to(self, "WARNING: Invalid object property. For usage information, type 'sandbox help'"); + break; + } - print_to(self, "Object pasted"); - if(autocvar_g_sandbox_info) - print(strcat(self.netname, " pasted an object at origin ", vtos(e.origin), "\n")); + return TRUE; + } - return TRUE; - } - else - { - print_to(self, "Invalid command. For usage information, type 'sandbox help'"); - return TRUE; + print_to(self, "WARNING: Object could not be edited. Make sure you are facing an object that belongs to you"); + return TRUE; + + // ---------------- COMMAND: DEFAULT ---------------- + default: + print_to(self, "Invalid command. For usage information, type 'sandbox help'"); + return TRUE; } } return FALSE; @@ -191,7 +361,7 @@ MUTATOR_HOOKFUNCTION(sandbox_PlayerPreThink) entity e; float grab; - e = sandbox_EditObject(); + e = sandbox_EditObject_Get(); if(e != world && vlen(e.origin - self.origin) <= autocvar_g_sandbox_editor_distance_edit) grab = TRUE; @@ -205,10 +375,37 @@ MUTATOR_HOOKFUNCTION(sandbox_PlayerPreThink) return FALSE; } +MUTATOR_HOOKFUNCTION(sandbox_ClientDisconnect) +{ + // unzone the player's clipboard if it's not empty + if(self.object_clipboard) + { + strunzone(self.object_clipboard); + self.object_clipboard = string_null; + } + + return FALSE; +} + MUTATOR_DEFINITION(sandbox) { MUTATOR_HOOK(SV_ParseClientCommand, sandbox_PlayerCommand, CBC_ORDER_ANY); MUTATOR_HOOK(PlayerPreThink, sandbox_PlayerPreThink, CBC_ORDER_ANY); + MUTATOR_HOOK(ClientDisconnect, sandbox_ClientDisconnect, CBC_ORDER_ANY); - return 0; + MUTATOR_ONADD + { + float i; + for (i = 1; i <= 5; i++) + { + // precache material sounds + precache_sound(strcat("objects/impact_metal_", ftos(i), ".ogg")); + precache_sound(strcat("objects/impact_stone_", ftos(i), ".ogg")); + precache_sound(strcat("objects/impact_wood_", ftos(i), ".ogg")); + precache_sound(strcat("objects/impact_flesh_", ftos(i), ".ogg")); + } + } + + return FALSE; } +