X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fmutators%2Fsandbox.qc;h=9afe34ffb3c09ccd3a8270c744d30b9f44398e68;hb=25bec571007cb22ae00c9c45dcfd4f6cbdc01428;hp=0c73c463b1c61c540a839adb14e68df8055755c5;hpb=acd177420875786e848b565fdff763c44f8277eb;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/mutators/sandbox.qc b/qcsrc/server/mutators/sandbox.qc index 0c73c463b..9afe34ffb 100644 --- a/qcsrc/server/mutators/sandbox.qc +++ b/qcsrc/server/mutators/sandbox.qc @@ -1,6 +1,52 @@ .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 @@ -12,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,10 +77,14 @@ entity sandbox_SpawnObject() e.realowner = self; e.classname = "object"; 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.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); @@ -35,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? @@ -61,9 +157,15 @@ MUTATOR_HOOKFUNCTION(sandbox_PlayerCommand) 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 ^7- changes the skin of the object"); - print_to(self, "^3frame ^7- object animation frame, for self-animated models"); - print_to(self, "^3physics ^7- object physics, 0 = static, 1 = movable, 2 = physical"); + 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; @@ -121,7 +223,7 @@ MUTATOR_HOOKFUNCTION(sandbox_PlayerCommand) // ---------------- COMMAND: REMOVE OBJECT ---------------- case "remove_object": - e = sandbox_EditObject(); + e = sandbox_EditObject_Get(); if(e != world) { if(autocvar_g_sandbox_info) @@ -138,13 +240,12 @@ MUTATOR_HOOKFUNCTION(sandbox_PlayerCommand) 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 + e = sandbox_EditObject_Get(); // you can only copy objects you can edit, so this works if(e != world) { - // set clipboard properties if(self.object_clipboard) strunzone(self.object_clipboard); - self.object_clipboard = strzone(strcat(e.model, " ", ftos(e.skin), " ", ftos(e.frame), " ", ftos(e.movetype))); + self.object_clipboard = strzone(sandbox_Storage_Save(e)); print_to(self, "Object copied to clipboard"); return TRUE; @@ -164,13 +265,7 @@ MUTATOR_HOOKFUNCTION(sandbox_PlayerCommand) } e = sandbox_SpawnObject(); - tokenize_console(self.object_clipboard); - - // apply clipboard properties - setmodel(e, argv(0)); - e.skin = stof(argv(1)); - e.frame = stof(argv(2)); - e.movetype = stof(argv(3)); + sandbox_Storage_Load(e, self.object_clipboard); print_to(self, "Object pasted"); if(autocvar_g_sandbox_info) @@ -186,7 +281,7 @@ MUTATOR_HOOKFUNCTION(sandbox_PlayerCommand) return TRUE; } - e = sandbox_EditObject(); + e = sandbox_EditObject_Get(); if(e != world) { switch(argv(2)) @@ -194,9 +289,21 @@ MUTATOR_HOOKFUNCTION(sandbox_PlayerCommand) 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)) { @@ -213,6 +320,12 @@ MUTATOR_HOOKFUNCTION(sandbox_PlayerCommand) 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; @@ -248,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; @@ -280,5 +393,19 @@ MUTATOR_DEFINITION(sandbox) MUTATOR_HOOK(PlayerPreThink, sandbox_PlayerPreThink, CBC_ORDER_ANY); MUTATOR_HOOK(ClientDisconnect, sandbox_ClientDisconnect, CBC_ORDER_ANY); + 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; } +