Commit Graph

307 Commits

Author SHA1 Message Date
Jared Scott a5dfe8f189 Update path.js 2020-08-15 23:30:41 -06:00
Michael Townsend dc06cf9de6 Merge pull request #622 from youknowone/update-pot
Add missing gettext markers + Update adarkroom.pot
2018-09-19 10:18:33 -04:00
Roarez d498a13177 Fix buying maps causing crashes
Fixes the applyMap function that could not uncover single points of map on the top and left borders and thus was causing an infinite loop crash
2018-09-11 00:43:49 +01:00
Jeong YunWon 99f28877e8 Add missing messages to gettext 2018-06-09 23:47:04 +09:00
hun0975 4e37103171 jshint warning ('cur' is already defined)
The "cur" variable is defined twice in each for loop.
So I pulled out the definition part of the "cur" variable.
2017-12-04 15:35:00 +09:00
Dee Newcum 7548e8cced doubleTime is harmful during space.js, it makes it much harder 2017-06-16 15:22:42 -05:00
Chris Farrow f0edb8f6d5 Moved the shady builder to the room module 2017-05-18 10:11:18 -05:00
Chris Farrow 1156df4693 got rid of an accidental comma 2017-05-13 15:15:31 -05:00
Chris Farrow 878e83d631 adjusted some of the text for the shady builder event 2017-05-13 15:11:36 -05:00
Chris Farrow 59c79b686d Made an event where a shady builder would enter the village and either build a house or steal some wood 2017-05-12 16:23:15 -05:00
Dennis 84336b06a3 Added the option to close the 'get app' dialog 2017-04-30 10:57:31 +02:00
Lucas Lois fb9e39bbaf Merge branch 'master' into jshint-compliance 2017-01-25 11:44:18 -03:00
Continuities 5f13d94cdf Marketing stuff, mostly 2016-12-17 14:53:21 -05:00
Jennifer 3ae7ee16cc tooltip on top near bottom of store and trading post 2016-12-10 21:09:18 -08:00
Blake Grotewold 1a6b41c2a1 Don't save carryables if they haven't been found yet. 2016-10-11 02:29:41 -04:00
Lucas Lois 69267045a8 Made events/room.js and state_manager.js jshinthint compliant 2016-10-02 18:07:02 -03:00
Lucas Lois 36b01a78b6 Made scoring.js, space.js and world.js jshint compliant 2016-10-02 17:57:17 -03:00
Lucas Lois c1ce1a89d9 Made room.js jshint compliant 2016-10-02 17:52:39 -03:00
Lucas Lois 05edb2a98a Made path.js jshint compliant 2016-10-02 17:52:22 -03:00
Lucas Lois a903a1c9fe Made outside.js jshint compliant 2016-10-02 17:45:09 -03:00
Lucas Lois 8370eac8aa Made events.js jshint compliant 2016-10-02 17:40:54 -03:00
Lucas Lois 4ced5337da Made engine.js jshint compliant.
Error on /script/engine.js at 775:128 was ignored
2016-10-02 17:22:32 -03:00
Lucas Lois 90aa1ca4fd Made Button.js jshint compliant 2016-10-02 17:00:57 -03:00
Michael Townsend 5a99e22b64 Fixing bugs 2016-09-23 11:39:07 -04:00
Michael Townsend 8a80f7c164 Fixing bugs 2016-09-23 11:32:34 -04:00
Michael Townsend fbc91a3756 Disable pause button until I have time to rework/fix it
The pause button displays weirdly and doesn't appear to work properly. Disable it until it can be reworked.
2016-09-23 11:16:08 -04:00
Blake Grotewold 8d9c4a1a92 Merge remote-tracking branch 'origin/master' 2016-09-17 15:18:22 -04:00
Michael Townsend 1fc1836a95 Merge pull request #463 from AndySky21/Take-everything-bug
Take-everything bug
2016-09-01 11:15:34 -04:00
Continuities a988d962f1 Add link to Google Play 2016-07-08 18:41:10 -04:00
Michael Townsend e1b1ed28b1 Revert "Fix message typo." 2016-05-12 13:53:01 -04:00
Jim Tittsler cc1e658144 Fix message typo. 2016-05-12 23:59:38 +09:00
Blake Grotewold 0fbb713e17 fix merge conflict error 2016-03-19 15:17:32 -04:00
Blake Grotewold 9438d2c30b Merge pull request #471 from code-kit/master
More Weapons/Tools Information on Path Tab
2016-03-19 15:01:01 -04:00
Blake Grotewold 7871f47776 Merge #469 2016-03-19 15:00:32 -04:00
Blake Grotewold 9a45ad1380 Merge pull request #467 from AndySky21/setHeal
Set heal
2016-03-19 14:56:36 -04:00
Blake Grotewold 5b870244f5 Merge pull request #464 from AndySky21/StoreZero-bug
StoreZero bug
2016-03-19 14:56:10 -04:00
Blake Grotewold cc18daa111 Merge pull request #463 from AndySky21/Take-everything-bug
Take-everything bug
2016-03-19 14:55:55 -04:00
Blake Grotewold 3d8e07510f Merge pull request #462 from AndySky21/mapBug
Map bug fix
2016-03-19 14:55:42 -04:00
Elizabeth Donohew 41293d48a8 Rewrote a couple of the descriptions that I added before for the tools. 2016-02-24 00:03:28 -06:00
Elizabeth Donohew 9083a9582c Hovering over a tool on the path tab now gives a small description on how the tool can be used. 2016-02-23 22:40:04 -06:00
Elizabeth Donohew 4d9890f2ef Renamed total to currentBagCapacity in the updateOutfitting method and extracted some functionality into a method called updateBagSpace. 2016-02-23 21:07:21 -06:00
Elizabeth Donohew 7efe142637 Shows the damage that a weapon deals only when hovering over a weapon on the path tab. 2016-02-23 20:46:19 -06:00
Andrea Rendine a3b1fea424 Method and property fix
World.testMap() sets World.seenAll. The latter is true when the whole map has been explored.
World.testMap() is called:

* on world init
* on return home (when the map is updated)
* on applyMap() (when the map is bought from the scout)
2016-02-20 13:17:45 +01:00
Andrea Rendine 189af75c31 Correct changes
Limited subset of commits:
* unified function for healing (Events.doHeal);
* unified function for attacks (Events.damage);
* check if health is max, and disable healing buttons (Events.setHeal and related calls)
* grouping buttons (attackButtons, healButtons and exitButtons for weapon attacks, meat & meds, continue/leave)
2016-02-17 15:22:13 +01:00
Andrea Rendine 368529f024 Reverted changes
Revert to previous version (no pause)
2016-02-17 15:07:26 +01:00
Andrea Rendine 68732ce0d9 Reverted changes
Revert to previous version
2016-02-17 14:16:39 +01:00
Andrea Rendine df63ccb651 Switch cooldown
Easy way to switch cooldown on pause button according to new button option
2016-02-17 10:27:38 +01:00
Andrea Rendine ac34b717d3 Forcing cooldown
Added an option.
Button.cooldown(btn, X) where X is a number, forces a one-time cooldown of X seconds for btn.
2016-02-17 10:19:32 +01:00
Andrea Rendine 07998376e7 Several changes
As some of them are related to each other, this commit involves a lot of updates.

* Autopause on blur. This is an idea I took from Gridland (!), if window loses focus the fight pauses (timed check courtesy of the enemy), and it restarts when the window has focus again (if the pause button is clicked, then the player must click again in order to resume).
* Delayed start for fights. This will allow players to read the description without the player attacking them. No way to cheat, buttons are not enabled. I used Events._LEAVE_COOLDOWN as cooldown time, not for laziness, but because I guess the two durations have the same purpose: to allow (force) the player to read stuff.
* Take everything and leave just by name. If the player can just take something, the text is "take all you can", if they can take everything but there are several options it's "take everything", if the option is only one the text is "take everything and X", where X is the verb of the only possible option (note: in the latter case, the button cools down together with the option itself).
* success/failure mechanics no longer relies upon try/catch, but on a simple mechanism: a variable taking a bool value, set to true when one of the end conditions happens. The precedence goes to the enemy (if the player kills and dies the fight is lost).
2016-02-17 01:53:21 +01:00
Andrea Rendine aae770c5a1 Timing for winning and efficiency 2016-02-16 11:02:10 +01:00