summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorStar Rauchenberger <fefferburbia@gmail.com>2022-03-16 20:23:40 -0400
committerStar Rauchenberger <fefferburbia@gmail.com>2022-03-16 20:23:40 -0400
commitc75c9a7170eee423d4b8c654867e1f3d7e1e84bc (patch)
tree534b2afe390776dc71a759c54d0c78246e163520
parent8e430782771d1f2980b367daf17d809d5805b7e4 (diff)
downloadether-c75c9a7170eee423d4b8c654867e1f3d7e1e84bc.tar.gz
ether-c75c9a7170eee423d4b8c654867e1f3d7e1e84bc.tar.bz2
ether-c75c9a7170eee423d4b8c654867e1f3d7e1e84bc.zip
signs are more common and also quieter
-rw-r--r--res/fmod/.cache/{361fc1a8-d59d-457a-a127-53c15fc44ad0}.pdcbin1168 -> 1168 bytes
-rw-r--r--res/fmod/.cache/{8b5445b2-2068-4279-a98b-2421a2eecfb3}.pdcbin744 -> 744 bytes
-rw-r--r--res/fmod/.cache/{ad50d646-eeb1-4122-a813-266411b659fb}.pdcbin1072 -> 1072 bytes
-rw-r--r--res/fmod/.user/Metadata/Event/{68372a81-e8b2-4b54-b8a4-93de302bcc94}.user.xml2
-rw-r--r--res/fmod/Metadata/Event/{68372a81-e8b2-4b54-b8a4-93de302bcc94}.xml3
-rw-r--r--src/game.cpp4
6 files changed, 6 insertions, 3 deletions
diff --git a/res/fmod/.cache/{361fc1a8-d59d-457a-a127-53c15fc44ad0}.pdc b/res/fmod/.cache/{361fc1a8-d59d-457a-a127-53c15fc44ad0}.pdc index bbae29d..45c8cb1 100644 --- a/res/fmod/.cache/{361fc1a8-d59d-457a-a127-53c15fc44ad0}.pdc +++ b/res/fmod/.cache/{361fc1a8-d59d-457a-a127-53c15fc44ad0}.pdc
Binary files differ
diff --git a/res/fmod/.cache/{8b5445b2-2068-4279-a98b-2421a2eecfb3}.pdc b/res/fmod/.cache/{8b5445b2-2068-4279-a98b-2421a2eecfb3}.pdc index 709769b..25e939d 100644 --- a/res/fmod/.cache/{8b5445b2-2068-4279-a98b-2421a2eecfb3}.pdc +++ b/res/fmod/.cache/{8b5445b2-2068-4279-a98b-2421a2eecfb3}.pdc
Binary files differ
diff --git a/res/fmod/.cache/{ad50d646-eeb1-4122-a813-266411b659fb}.pdc b/res/fmod/.cache/{ad50d646-eeb1-4122-a813-266411b659fb}.pdc index 2e3248f..893d95a 100644 --- a/res/fmod/.cache/{ad50d646-eeb1-4122-a813-266411b659fb}.pdc +++ b/res/fmod/.cache/{ad50d646-eeb1-4122-a813-266411b659fb}.pdc
Binary files differ
diff --git a/res/fmod/.user/Metadata/Event/{68372a81-e8b2-4b54-b8a4-93de302bcc94}.user.xml b/res/fmod/.user/Metadata/Event/{68372a81-e8b2-4b54-b8a4-93de302bcc94}.user.xml index 8deeed0..e90b3a5 100644 --- a/res/fmod/.user/Metadata/Event/{68372a81-e8b2-4b54-b8a4-93de302bcc94}.user.xml +++ b/res/fmod/.user/Metadata/Event/{68372a81-e8b2-4b54-b8a4-93de302bcc94}.user.xml
@@ -12,7 +12,7 @@
12 <object class="GroupTrack" id="{f93105f9-338b-4be2-bb3b-38b7a54a95da}"/> 12 <object class="GroupTrack" id="{f93105f9-338b-4be2-bb3b-38b7a54a95da}"/>
13 <object class="Timeline" id="{8d0e479a-a12b-473f-93aa-de133b6c288c}"> 13 <object class="Timeline" id="{8d0e479a-a12b-473f-93aa-de133b6c288c}">
14 <property name="uiLastRulerScaleRatio"> 14 <property name="uiLastRulerScaleRatio">
15 <value>0.016137708445400752</value> 15 <value>0.00019052132238945424</value>
16 </property> 16 </property>
17 </object> 17 </object>
18 <object class="EventMixerMaster" id="{d6928c43-7ad8-4ac8-afde-404be9c3c3c9}"> 18 <object class="EventMixerMaster" id="{d6928c43-7ad8-4ac8-afde-404be9c3c3c9}">
diff --git a/res/fmod/Metadata/Event/{68372a81-e8b2-4b54-b8a4-93de302bcc94}.xml b/res/fmod/Metadata/Event/{68372a81-e8b2-4b54-b8a4-93de302bcc94}.xml index 18db19f..9e0eb3a 100644 --- a/res/fmod/Metadata/Event/{68372a81-e8b2-4b54-b8a4-93de302bcc94}.xml +++ b/res/fmod/Metadata/Event/{68372a81-e8b2-4b54-b8a4-93de302bcc94}.xml
@@ -97,6 +97,9 @@
97 </relationship> 97 </relationship>
98 </object> 98 </object>
99 <object class="EventMixerGroup" id="{cfc8b7fd-e863-413e-89e8-c6f0bc5db7a8}"> 99 <object class="EventMixerGroup" id="{cfc8b7fd-e863-413e-89e8-c6f0bc5db7a8}">
100 <property name="volume">
101 <value>-8</value>
102 </property>
100 <property name="name"> 103 <property name="name">
101 <value>Audio 1</value> 104 <value>Audio 1</value>
102 </property> 105 </property>
diff --git a/src/game.cpp b/src/game.cpp index 5838528..088ab4d 100644 --- a/src/game.cpp +++ b/src/game.cpp
@@ -276,7 +276,7 @@ void Game::recalculateRender() {
276 if (isTileSetOrNotLit(map, x-1, y+1)) renderDesc |= (1 << 1); 276 if (isTileSetOrNotLit(map, x-1, y+1)) renderDesc |= (1 << 1);
277 if (isTileSetOrNotLit(map, x-1, y )) renderDesc |= (1 << 0); 277 if (isTileSetOrNotLit(map, x-1, y )) renderDesc |= (1 << 0);
278 278
279 if (renderDesc == 0 && map.at(x,y).sign) { 279 if (/*renderDesc == 0 && */map.at(x,y).sign) {
280 map.at(x,y).renderId = TilesetIndex(24, 13); 280 map.at(x,y).renderId = TilesetIndex(24, 13);
281 } else if (std::bernoulli_distribution(0.05)(rng)) { 281 } else if (std::bernoulli_distribution(0.05)(rng)) {
282 static const std::vector<int> furnishings { 282 static const std::vector<int> furnishings {
@@ -286,7 +286,7 @@ void Game::recalculateRender() {
286 TilesetIndex(21, 3), 286 TilesetIndex(21, 3),
287 TilesetIndex(22, 3)}; 287 TilesetIndex(22, 3)};
288 288
289 if (renderDesc == 0 && !(x == player_x && y == player_y) && std::bernoulli_distribution(0.2)(rng)) { 289 if (/*renderDesc == 0 &&*/ !(x == player_x && y == player_y) && std::bernoulli_distribution(0.005)(rng)) {
290 map.at(x,y).renderId = TilesetIndex(24, 13); 290 map.at(x,y).renderId = TilesetIndex(24, 13);
291 map.at(x,y).sign = true; 291 map.at(x,y).sign = true;
292 } else { 292 } else {