X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fmutators%2Fsandbox.qc;h=9afe34ffb3c09ccd3a8270c744d30b9f44398e68;hb=25bec571007cb22ae00c9c45dcfd4f6cbdc01428;hp=72830d58a479a9ae6a427afb555475f68e599cdf;hpb=0cd168336bae636c572d55b24fce0b9f3fd0528d;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/mutators/sandbox.qc b/qcsrc/server/mutators/sandbox.qc index 72830d58a..9afe34ffb 100644 --- a/qcsrc/server/mutators/sandbox.qc +++ b/qcsrc/server/mutators/sandbox.qc @@ -1,9 +1,50 @@ .string object_clipboard; .float material; +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() { @@ -27,21 +68,6 @@ void sandbox_EditObject_Scale(entity e, float f) } } -void sandbox_Object_Touch() -{ - if(!self.material) - return; - - switch(self.material) - { - case MATERIAL_METAL: - sound(self, CH_TRIGGER, strcat("object/impact_metal_", ftos(ceil(random() * 5)) , ".ogg"), VOL_BASE, ATTN_NORM); - break; - default: - break; - } -} - entity sandbox_SpawnObject() { // spawn a new object with default properties @@ -56,7 +82,7 @@ entity sandbox_SpawnObject() e.movetype = MOVETYPE_TOSS; e.frame = 0; e.skin = 0; - e.material = MATERIAL_METAL; + e.material = MATERIAL_NONE; e.touch = sandbox_Object_Touch; @@ -69,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? @@ -103,7 +165,7 @@ MUTATOR_HOOKFUNCTION(sandbox_PlayerCommand) 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)"); + 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; @@ -183,20 +245,8 @@ MUTATOR_HOOKFUNCTION(sandbox_PlayerCommand) { if(self.object_clipboard) strunzone(self.object_clipboard); + self.object_clipboard = strzone(sandbox_Storage_Save(e)); - // set clipboard properties - self.object_clipboard = strcat(e.model, " "); - self.object_clipboard = strcat(self.object_clipboard, ftos(e.skin), " "); - self.object_clipboard = strcat(self.object_clipboard, ftos(e.alpha), " "); - self.object_clipboard = strcat(self.object_clipboard, sprintf("\"%.9v\"", e.colormod), " "); - self.object_clipboard = strcat(self.object_clipboard, sprintf("\"%.9v\"", e.glowmod), " "); - self.object_clipboard = strcat(self.object_clipboard, ftos(e.frame), " "); - self.object_clipboard = strcat(self.object_clipboard, ftos(e.scale), " "); - self.object_clipboard = strcat(self.object_clipboard, ftos(e.movetype), " "); - self.object_clipboard = strcat(self.object_clipboard, ftos(e.damageforcescale), " "); - self.object_clipboard = strcat(self.object_clipboard, ftos(e.material), " "); - - self.object_clipboard = strzone(self.object_clipboard); print_to(self, "Object copied to clipboard"); return TRUE; } @@ -215,19 +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.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)); + sandbox_Storage_Load(e, self.object_clipboard); print_to(self, "Object pasted"); if(autocvar_g_sandbox_info) @@ -360,7 +398,11 @@ MUTATOR_DEFINITION(sandbox) 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")); } }