Configurable Piss Sound (dkfans#3608)

walt253 · web-flow · commit 41ecf1047da9 · 2024-11-01T01:32:31.000+01:00
Snuck in the fix to  the j8 related build error in png2ico
diff --git a/config/creatrs/archer.cfg b/config/creatrs/archer.cfg
@@ -140,3 +140,4 @@ Drop = 649 1
 Torture = 650 3
 Slap = 653 1
 Fight = 638 3
+Piss = 171 1
diff --git a/config/creatrs/avatar.cfg b/config/creatrs/avatar.cfg
@@ -140,3 +140,4 @@ Drop = 717 1
 Torture = 718 3
 Slap = 721 1
 Fight = 706 3
+Piss = 171 1
diff --git a/config/creatrs/barbarian.cfg b/config/creatrs/barbarian.cfg
@@ -140,3 +140,4 @@ Drop = 632 1
 Torture = 633 3
 Slap = 636 1
 Fight = 621 3
+Piss = 171 1
diff --git a/config/creatrs/bile_demon.cfg b/config/creatrs/bile_demon.cfg
@@ -140,3 +140,4 @@ Drop = 479 1
 Torture = 480 3
 Slap = 483 1
 Fight = 468 3
+Piss = 94 6
diff --git a/config/creatrs/bug.cfg b/config/creatrs/bug.cfg
@@ -140,3 +140,4 @@ Drop = 513 1
 Torture = 514 3
 Slap = 517 1
 Fight = 502 3
+Piss = 171 1
diff --git a/config/creatrs/dark_mistress.cfg b/config/creatrs/dark_mistress.cfg
@@ -140,3 +140,4 @@ Drop = 445 1
 Torture = 446 3
 Slap = 449 1
 Fight = 434 3
+Piss = 171 1
diff --git a/config/creatrs/demonspawn.cfg b/config/creatrs/demonspawn.cfg
@@ -140,3 +140,4 @@ Drop = 411 1
 Torture = 412 3
 Slap = 415 1
 Fight = 400 3
+Piss = 171 1
diff --git a/config/creatrs/dragon.cfg b/config/creatrs/dragon.cfg
@@ -140,3 +140,4 @@ Drop = 394 1
 Torture = 395 3
 Slap = 398 1
 Fight = 383 3
+Piss = 171 1
diff --git a/config/creatrs/druid.cfg b/config/creatrs/druid.cfg
@@ -140,3 +140,4 @@ Drop = 462 1
 Torture = 463 3
 Slap = 466 1
 Fight = 451 3
+Piss = 171 1
diff --git a/config/creatrs/dwarfa.cfg b/config/creatrs/dwarfa.cfg
@@ -140,3 +140,4 @@ Drop = 734 1
 Torture = 735 3
 Slap = 738 1
 Fight = 723 3
+Piss = 171 1
diff --git a/config/creatrs/fairy.cfg b/config/creatrs/fairy.cfg
@@ -140,3 +140,4 @@ Drop = 785 1
 Torture = 786 3
 Slap = 789 1
 Fight = 774 3
+Piss = 171 1
diff --git a/config/creatrs/floating_spirit.cfg b/config/creatrs/floating_spirit.cfg
@@ -139,3 +139,4 @@ Drop = 0 0
 Torture = 0 0
 Slap = 0 0
 Fight = 0 0
+Piss = 0 0
diff --git a/config/creatrs/fly.cfg b/config/creatrs/fly.cfg
@@ -140,3 +140,4 @@ Drop = 428 1
 Torture = 429 3
 Slap = 432 1
 Fight = 417 3
+Piss = 171 1
diff --git a/config/creatrs/ghost.cfg b/config/creatrs/ghost.cfg
@@ -141,3 +141,4 @@ Drop = 581 1
 Torture = 582 3
 Slap = 585 1
 Fight = 570 3
+Piss = 171 1
diff --git a/config/creatrs/giant.cfg b/config/creatrs/giant.cfg
@@ -140,3 +140,4 @@ Drop = 768 1
 Torture = 769 3
 Slap = 772 1
 Fight = 757 3
+Piss = 171 1
diff --git a/config/creatrs/hell_hound.cfg b/config/creatrs/hell_hound.cfg
@@ -140,3 +140,4 @@ Drop = 564 1
 Torture = 565 3
 Slap = 568 1
 Fight = 553 3
+Piss = 171 1
diff --git a/config/creatrs/horny.cfg b/config/creatrs/horny.cfg
@@ -140,3 +140,4 @@ Drop = 343 1
 Torture = 344 3
 Slap = 347 1
 Fight = 332 3
+Piss = 171 1
diff --git a/config/creatrs/imp.cfg b/config/creatrs/imp.cfg
@@ -367,3 +367,5 @@ Torture = 497 3
 Slap = 490 3
 ; The sound used for fighting.
 Fight = 485 3
+; The sound used for pissing.
+Piss = 171 1
diff --git a/config/creatrs/knight.cfg b/config/creatrs/knight.cfg
@@ -140,3 +140,4 @@ Drop = 700 1
 Torture = 701 3
 Slap = 704 1
 Fight = 689 3
+Piss = 171 1
diff --git a/config/creatrs/monk.cfg b/config/creatrs/monk.cfg
@@ -140,3 +140,4 @@ Drop = 666 1
 Torture = 667 3
 Slap = 670 1
 Fight = 655 3
+Piss = 171 1
diff --git a/config/creatrs/orc.cfg b/config/creatrs/orc.cfg
@@ -140,3 +140,4 @@ Drop = 377 1
 Torture = 378 3
 Slap = 381 1
 Fight = 366 3
+Piss = 171 1
diff --git a/config/creatrs/samurai.cfg b/config/creatrs/samurai.cfg
@@ -140,3 +140,4 @@ Drop = 819 1
 Torture = 820 3
 Slap = 823 1
 Fight = 808 3
+Piss = 171 1
diff --git a/config/creatrs/skeleton.cfg b/config/creatrs/skeleton.cfg
@@ -140,3 +140,4 @@ Drop = 360 1
 Torture = 361 3
 Slap = 364 1
 Fight = 349 3
+Piss = 171 1
diff --git a/config/creatrs/sorceror.cfg b/config/creatrs/sorceror.cfg
@@ -140,3 +140,4 @@ Drop = 462 1
 Torture = 463 3
 Slap = 466 1
 Fight = 451 3
+Piss = 171 1
diff --git a/config/creatrs/spider.cfg b/config/creatrs/spider.cfg
@@ -140,3 +140,4 @@ Drop = 547 1
 Torture = 548 3
 Slap = 551 1
 Fight = 536 3
+Piss = 171 1
diff --git a/config/creatrs/tentacle.cfg b/config/creatrs/tentacle.cfg
@@ -140,3 +140,4 @@ Drop = 598 1
 Torture = 599 3
 Slap = 602 1
 Fight = 587 3
+Piss = 171 1
diff --git a/config/creatrs/thief.cfg b/config/creatrs/thief.cfg
@@ -140,3 +140,4 @@ Drop = 802 1
 Torture = 803 3
 Slap = 806 1
 Fight = 791 3
+Piss = 171 1
diff --git a/config/creatrs/time_mage.cfg b/config/creatrs/time_mage.cfg
@@ -140,3 +140,4 @@ Drop = 615 1
 Torture = 616 3
 Slap = 619 1
 Fight = 604 3
+Piss = 171 1
diff --git a/config/creatrs/troll.cfg b/config/creatrs/troll.cfg
@@ -140,3 +140,4 @@ Drop = 377 1
 Torture = 378 3
 Slap = 381 1
 Fight = 366 3
+Piss = 171 1
diff --git a/config/creatrs/tunneller.cfg b/config/creatrs/tunneller.cfg
@@ -140,3 +140,4 @@ Drop = 683 1
 Torture = 684 3
 Slap = 687 1
 Fight = 672 3
+Piss = 171 1
diff --git a/config/creatrs/vampire.cfg b/config/creatrs/vampire.cfg
@@ -142,3 +142,4 @@ Drop = 530 1
 Torture = 531 3
 Slap = 534 1
 Fight = 519 3
+Piss = 171 1
diff --git a/config/creatrs/witch.cfg b/config/creatrs/witch.cfg
@@ -140,3 +140,4 @@ Drop = 751 1
 Torture = 752 3
 Slap = 755 1
 Fight = 740 3
+Piss = 171 1
diff --git a/config/creatrs/wizard.cfg b/config/creatrs/wizard.cfg
@@ -140,3 +140,4 @@ Drop = 615 1
 Torture = 616 3
 Slap = 619 1
 Fight = 604 3
+Piss = 171 1
diff --git a/src/config_crtrmodel.c b/src/config_crtrmodel.c
@@ -232,6 +232,7 @@ const struct NamedCommand creatmodel_sounds_commands[] = {
   {"DIE",                  CrSnd_Die},
   {"FOOT",                 CrSnd_Foot},
   {"FIGHT",                CrSnd_Fight},
+  {"PISS",                 CrSnd_Piss},
   {NULL,                   0},
   };
 
@@ -2461,6 +2462,25 @@ TbBool parse_creaturemodel_sounds_blocks(long crtr_model,char *buf,long len,cons
                   COMMAND_TEXT(cmd_num),block_buf,config_textname);
             }
             break;
+        case CrSnd_Piss:
+            if (get_conf_parameter_single(buf,&pos,len,word_buf,sizeof(word_buf)) > 0)
+            {
+              k = atoi(word_buf);
+              game.conf.crtr_conf.creature_sounds[crtr_model].piss.index = k;
+              n++;
+            }
+            if (get_conf_parameter_single(buf,&pos,len,word_buf,sizeof(word_buf)) > 0)
+            {
+              k = atoi(word_buf);
+              game.conf.crtr_conf.creature_sounds[crtr_model].piss.count = k;
+              n++;
+            }
+            if (n < 1)
+            {
+              CONFWRNLOG("Incorrect value of \"%s\" parameter in [%s] block of %s file.",
+                  COMMAND_TEXT(cmd_num),block_buf,config_textname);
+            }
+            break;
         case ccr_comment:
             break;
         case ccr_endOfFile:
diff --git a/src/creature_control.c b/src/creature_control.c
@@ -256,6 +256,8 @@ struct CreatureSound *get_creature_sound(struct Thing *thing, long snd_idx)
         return &game.conf.crtr_conf.creature_sounds[cmodel].foot;
     case CrSnd_Fight:
         return &game.conf.crtr_conf.creature_sounds[cmodel].fight;
+    case CrSnd_Piss:
+        return &game.conf.crtr_conf.creature_sounds[cmodel].piss;
     default:
         // Return dummy element
         return &game.conf.crtr_conf.creature_sounds[0].foot;
diff --git a/src/creature_control.h b/src/creature_control.h
@@ -68,6 +68,7 @@ enum CreatureSoundTypes {
     CrSnd_Die       = 9,
     CrSnd_Foot      = 10,
     CrSnd_Fight     = 11,
+    CrSnd_Piss      = 12,
 };
 
 enum CreatureControlFlags {
@@ -557,6 +558,7 @@ struct CreatureSounds {
     struct CreatureSound torture;
     struct CreatureSound slap;
     struct CreatureSound fight;
+    struct CreatureSound piss;
 };
 
 extern int creature_swap_idx[CREATURE_TYPES_MAX];
diff --git a/src/creature_states_mood.c b/src/creature_states_mood.c
@@ -124,11 +124,15 @@ short creature_be_happy(struct Thing *thing)
 short creature_piss(struct Thing *thing)
 {
     struct CreatureControl* cctrl = creature_control_get_from_thing(thing);
-    if ( !S3DEmitterIsPlayingSample(thing->snd_emitter_id, 171, 0) ) {
-        thing_play_sample(thing, 171, NORMAL_PITCH, 0, 3, 1, 6, FULL_LOUDNESS);
+    struct CreatureSound* crsound = get_creature_sound(thing, CrSnd_Piss);
+    unsigned short sound_idx = crsound->index + CREATURE_RANDOM(thing, crsound->count);
+    if (!S3DEmitterIsPlayingSample(thing->snd_emitter_id, sound_idx, 0)) {
+        thing_play_sample(thing, sound_idx, NORMAL_PITCH, 0, 3, 1, 6, FULL_LOUDNESS);
     }
     long i = cctrl->countdown_282;
-    if (i > 0) i--;
+    if (i > 0) {
+        i--;
+    }
     cctrl->countdown_282 = i;
     if (i > 0) {
         return 1;
diff --git a/src/lvl_script_commands.c b/src/lvl_script_commands.c
@@ -3243,6 +3243,10 @@ static void set_creature_configuration_process(struct ScriptContext* context)
             game.conf.crtr_conf.creature_sounds[creatid].fight.index = value;
             game.conf.crtr_conf.creature_sounds[creatid].fight.count = value2;
             break;
+        case 12: // PISS
+            game.conf.crtr_conf.creature_sounds[creatid].piss.index = value;
+            game.conf.crtr_conf.creature_sounds[creatid].piss.count = value2;
+            break;
         }
     }
     else if (block == CrtConf_SPRITES)
diff --git a/tool_png2ico.mk b/tool_png2ico.mk
@@ -42,7 +42,7 @@ $(PNGTOICO): tools/png2ico/$(PNGTOICO_PACKAGE)
 	-$(ECHO) 'Extracting package: $<'
 	$(MKDIR) "$(@D)"
 	cd "$(@D)"; \
-	tar -zxmUf "../../$<"
+	tar -zxmf "../../$<"
 	-$(ECHO) 'Finished extracting: $<'
 	-$(ECHO) ' '
 

Original file line number	Diff line number	Diff line change
`@@ -3243,6 +3243,10 @@ static void set_creature_configuration_process(struct ScriptContext* context)`
`3243`	`3243`	`game.conf.crtr_conf.creature_sounds[creatid].fight.index = value;`
`3244`	`3244`	`game.conf.crtr_conf.creature_sounds[creatid].fight.count = value2;`
`3245`	`3245`	`break;`
	`3246`	`+ case 12: // PISS`
	`3247`	`+ game.conf.crtr_conf.creature_sounds[creatid].piss.index = value;`
	`3248`	`+ game.conf.crtr_conf.creature_sounds[creatid].piss.count = value2;`
	`3249`	`+ break;`
`3246`	`3250`	`}`
`3247`	`3251`	`}`
`3248`	`3252`	`else if (block == CrtConf_SPRITES)`