zontreck/ToonTownRewritten
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
3751 commits 1 branch 0 tags 8.9 MiB
Commit graph

2886 commits

Author SHA1 Message Date
Anthony Castelli
325e8189f7 house: Disable moving interactive items to the attic 2014-08-09 15:44:20 -07:00
Anthony Castelli
6b4a94eb00 funiture: Properly spawn nteractive items 2014-08-09 15:43:21 -07:00
Anthony Castelli
e72378cf22 estate: ocd cleanup 2014-08-09 15:04:50 -07:00
Joey Z
2807b730d9 Widescreen support for the hangup button. This hides behind the cattlelog GUI when in 4:3 mode, and for the life of me I can't figure out a way around it. 2014-08-09 17:37:25 -04:00
Joey Z
0138e678ca cattlelog: Widescreen support 2014-08-09 14:12:26 -04:00
Harvir
b977900da2 district: Bump up pop limits. 2014-08-09 18:28:03 +01:00
Harvir
5c68480f13 tailor: Female toons can change torso types (shorts/skirts) 2014-08-09 00:35:50 +01:00
Harvir
3b0e871881 tailor: Extra sanity/security checks for tailor. 2014-08-08 22:46:11 +01:00
Harvir
1e17b4823a Revert "base: Mount every phase folder in non-mf at start up." 
This reverts commit e8a69a5745.
 2014-08-08 19:35:36 +01:00
Harvir
e8a69a5745 base: Mount every phase folder in non-mf at start up. 2014-08-08 03:12:21 +01:00
Anthony Castelli
92a7d30be7 windows: Delete window items (I think) 
Windows appear to be broken now
 2014-08-06 22:42:54 -07:00
Anthony Castelli
931cbb6fcd wallpapers: Redo the wallpapers 2014-08-06 22:30:16 -07:00
Anthony Castelli
0dbd1c7283 Revert "Make wallpapers less rip" 
This reverts commit 777990e8d6.
 2014-08-06 22:12:11 -07:00
Anthony Castelli
d3258b62df furnature: Allow items to be deleted 2014-08-06 21:40:50 -07:00
Anthony Castelli
b9abfbad7d furnature: Begin implementing deleting furnature 2014-08-06 20:39:05 -07:00
Anthony Castelli
dd45b0a17c Merge branch 'beta-wip' into estates 2014-08-06 19:13:07 -07:00
Harvir
ca1f342f58 rewards: Fix positioning for RewardPanel. 2014-08-05 20:10:04 +01:00
Harvir
6e7e051810 Revert "battle: Fix Reward Screen scale and experience speed" 
This reverts commit ce559c6576.
 2014-08-05 20:05:14 +01:00
Harvir
2a0f52843c localizer: Fix syntax errors. 2014-08-05 17:53:16 +01:00
Joey Z
36654fbce3 localizer: Phrase fix 2014-08-04 19:52:34 -04:00
Anthony Castelli
2de5edf37e Merge branch 'beta-wip' into estates 2014-08-03 21:20:02 -07:00
Anthony Castelli
0554519e74 Revert "last-seen: Redo the relative date stuff because it bugged me" 
This reverts commit 411dd98818.
 2014-08-03 11:27:55 -07:00
Anthony Castelli
411dd98818 last-seen: Redo the relative date stuff because it bugged me 2014-08-03 11:22:53 -07:00
Anthony Castelli
71b66e5df9 fuck POST_REMOVES 2014-08-03 10:47:04 -07:00
Harvir
d509f041e7 status: use a different config name for shard_heap_interval so it doesn't conflict with shard_status_interval. 2014-08-03 18:37:06 +01:00
Aidan Noll
6655f9e492 hack up german support :) 2014-08-03 04:58:29 -04:00
Harvir
1a8fa69a2a Merge branch 'beta-wip' into estates 2014-08-03 03:52:27 +01:00
Jeremy Koletar
d8b72c6ef2 Merge branch 'sequential-blacklist' into beta-wip 
Conflicts:
	deployment/server.prc
	toontown/toon/DistributedToonAI.py
 2014-08-02 19:24:26 -05:00
Anthony Castelli
67ee46cd8f blacklist: Load a local version of tsequence for dev environments 2014-08-02 14:47:30 -07:00
Anthony Castelli
6acac85bba Potential fix for KeepAlive 
Needs to be tested on mongodb
 2014-08-02 17:39:28 -04:00
Harv
03ef2a8e71 place: add newline. heartattack over 2014-08-02 15:32:03 -06:00
jjkoletar
ca3853f12b hood: Fix format string in my place debugging 2014-08-02 15:10:37 -06:00
Anthony Castelli
64867d61b3 Oops 2014-08-02 10:13:43 -07:00
Anthony Castelli
1c9116cd14 Potential fix for KeepAlive 
Needs to be tested on mongodb
 2014-08-02 09:39:58 -07:00
Harvir
bd6e4ca644 house: Don't delete the mailbox if it's never spawned. 2014-08-02 05:54:01 +01:00
Harvir
90487dc2c4 house: Don't spawn Mailbox if nobody owns the house. 2014-08-02 05:19:56 +01:00
Aidan Noll
dcf8089d06 estate: replace closets instead of giving a new one 2014-08-01 23:16:02 -04:00
Harvir
c3be499079 house: Use np.get_key() instead of deprecated np.id() 2014-08-02 01:18:53 +01:00
Harvir
7559b0c453 estate: Fix merge + prevent crash 2014-08-02 01:10:22 +01:00
Harvir
8531534aa8 Merge remote-tracking branch 'origin/beta-wip' into estates 
Conflicts:
	config/dev.prc
	deployment/server.prc
	toontown/estate/DistributedEstateAI.py
 2014-08-02 00:38:05 +01:00
Cosmos
60644320b3 otp: Address the comments on the MR. 2014-07-31 21:50:37 +03:00
Cosmos
0742799fb3 Merge branch 'beta-wip' into sequential-blacklist 2014-07-31 19:53:22 +03:00
Cosmos
7d4a643236 otp: rip. 2014-07-31 19:39:45 +03:00
Harvir
a4b8c7b9e7 config: Change keep-alive to want-keep-alive for consistency. 2014-07-31 17:33:22 +01:00
Harv
8c9627874a Merge branch 'av-panel-last-seen' into 'beta-wip' 
Avatar Panel - Last Seen String

**As per usual, this isn't a "lets blindly merge this in" as it is a database change.**

This was created as a result of Issue #72 and at the request of the community.

Currently, this will set the setLastSeen field on the DistributedToon object in the db whenever it is about to be deleted from the AI. When a toon requests an avatar's information (via TTRFMUD) this field is also passed along (this is the only time the client will receive it) and then the localizer will format the timestamp to a string and display it accordingly. (The function itself is in the localizer in case of differences between languages/grammar.)

For the English version, it currently goes as far as "days ago" however, we could potentially implement years (though there's really no need at this stage).

If setLastSeen isn't set (or hasn't been updated ever by the AI) it defaults to 0, which the client will pass as "Never" for last seen.

~~So far I've tested this under the YAML database, but not MongoDB.~~

EDIT 1: I tried to use a uint64 for the timestamp, but Astron (MongoDB backend) using mongo wasn't having any of it. uint32 works as normal with mongo.
 2014-07-31 10:24:00 -06:00
Harvir
9bfb6e7205 localizer: Add months and years to last seen. 
This could do with a clean-up, however at this stage there's no real need.
The seconds calculations got messy by the time I hit months (which is why
I left weeks out entirely. If anyone wants to, they can split the seconds
into multiple variables (years, months, days, hours, seconds, minutes),
possibly in another function altogether that returns a tuple. However I
deemed it unneeded work as it's already complete.
 2014-07-31 17:10:02 +01:00
Joey Z
79693d3e4b Adjust pop counts 2014-07-31 00:37:31 -04:00
Harvir
ee96def327 dg: Add butterflies and flower back. 2014-07-30 05:32:50 +01:00
Joey Z
4fb8e64e66 dna: Shuffle colors for girls as well, bump resources 2014-07-29 01:43:07 -04:00
Harvir
725f7def77 toon: Actually store last online and use it for av-panel. 2014-07-28 21:10:37 +01:00
Harvir
ec446c9735 panel: Add Last Seen to panel (curretly uses dummy data). 2014-07-28 20:32:22 +01:00
Joey Z
ce559c6576 battle: Fix Reward Screen scale and experience speed 2014-07-27 15:18:59 -04:00
Joey Z
d499d950b8 makeatoon: Code cleanup, allow multi-colored shuffles 2014-07-27 01:37:30 -04:00
Harvir
1f7dfe4abc toon: Don't give people heart attacks with a keepalive kick. 2014-07-27 03:36:18 +01:00
Sam Edwards
72b3a31df0 quest: Return success status in QMAI.removeClothingTicket(). 2014-07-26 17:59:51 -07:00
Sam Edwards
be340fa1ca quest: Properly remove clothing ticket quests when redeeming the ticket. 2014-07-26 17:57:53 -07:00
Joey Z
74895eff7c rip 2014-07-26 18:53:17 -04:00
Joey Z
bf8a48ee4d Forgot a : 2014-07-26 18:52:28 -04:00
Joey Z
b0135d8fbf Address Harv's issues 2014-07-26 18:49:37 -04:00
Joey Z
bb594e56b2 arg: Change Mary's phrase to give a hint 2014-07-26 18:49:37 -04:00
Harv
266a4c26f1 toon: add newline to appease gitlab 2014-07-26 16:42:50 -06:00
Harv
a1a8b958de toon: Yolo update to laff correction. 
I haven't actually tested this, but I just wanted to see the effects. Since this won't break/change anything, it's fine to put into prod without testing.
 2014-07-26 16:41:47 -06:00
Joey Z
329cd773f4 arg: Don't worry about position 2014-07-26 18:20:38 -04:00
Joey Z
3c6cc064c0 arg: Forgot HQ officer label 2014-07-26 18:19:03 -04:00
Joey Z
3bfe38d517 New ARG manager stuff 2014-07-26 18:17:20 -04:00
Jeremy Koletar
5d689ea538 Merge branch 'master' of git.riotcave.com:privatetoon/toontown into beta-wip 2014-07-23 19:43:44 -05:00
jjkoletar
29e4007a94 Merge branch 'better-ping-pong' into 'master' 
Better ping pong
 2014-07-23 18:40:44 -06:00
Hawkheart
dc7ed2db27 fix AI crash 2014-07-22 08:48:57 -06:00
Sam Edwards
9d1292072b dna: Change suit pathing not to depend on ctypes, but still use it if available. 2014-07-21 20:26:23 -07:00
Sam Edwards
4b8b8a7b04 dna: Change suit pathing not to depend on ctypes, but still use it if available. 2014-07-21 20:19:35 -07:00
jjkoletar
19e987d3cf Merge branch 'fix-performance' into 'beta-wip' 
Diagnostics to help track down performance issues

I'm assigning this to @jjkoletar as it most directly affects him.

The items in this merge help us monitor the server status better. We can get reports on what objects are running around in memory (from the new magic words) and whenever an AI server encounters an infinite loop, it will reset and log an exception (due to the new watchdog timer).

N.B. **The report magic words require access to the stdout/stderr output of the AI process.** I should hope that prod's equipped to log that anyway, though.
 2014-07-21 19:37:25 -06:00
Anthony Castelli
82a5c29472 keepalive: fire CLIENTAGENT_EJECT to alert friends the user have disappeared 
Im using the "This account has been logged in on another computer" message. Is there something better to use?
 2014-07-20 21:41:00 -07:00
Sam Edwards
14bf0008ad distributed: AI should log when its startup operations complete. 2014-07-20 20:19:33 -07:00
Sam Edwards
c640190d24 dna: Decrease time required to generate routing table. 2014-07-20 20:19:20 -07:00
Sam Edwards
4a786046b3 dna: Make improved suit pathing algorithm more space-efficient by using a lookup table rather than an in-memory graph. 2014-07-20 20:08:36 -07:00
Anthony Castelli
9c7085b1af Put the KeepAlive update in the wrong place 2014-07-20 12:43:08 -07:00
Sam Edwards
63c70a52b4 dna: Clean up old debugging vars... 2014-07-20 05:03:53 -07:00
Sam Edwards
2650cf6ede dna: Replace slow BFS-based suit path search with a modified distance-vector routing tree. 
This makes suit pathing approximately 50x faster (at the expense of
more AI startup time), eliminating the the single largest cause of AI lag.
 2014-07-20 04:58:42 -07:00
Sam Edwards
12f7fff0e5 distributed: Don't open interest on the QuietZone. This is bug-prone and wastes bandwidth/CPU. 2014-07-20 01:17:41 -07:00
Joey Z
adee520ef9 battle: Raise experience cap at the request of the community 2014-07-20 03:30:04 -04:00
Anthony Castelli
49957df3d5 A better ping-pong keep alive system 2014-07-19 23:49:40 -07:00
Joey Z
4b513ca345 invasion: Slightly decrease probability 2014-07-19 11:20:02 -04:00
Joey Z
075e0e9351 Merge branch 'master' of git@git.riotcave.com:privatetoon/toontown.git into beta-wip 2014-07-19 10:55:18 -04:00
Joey Z
a0ec28db77 globals: Increase pop counts. 2014-07-19 03:45:42 +01:00
Jeremy Koletar
e585a973f1 hood: Give more information about this common crash 2014-07-16 21:58:10 -05:00
Jeremy Koletar
ddf3b48cf9 building: Don't try to do anything with the offsetNP unless we were setup 2014-07-16 20:57:24 -05:00
Joey Z
2be2f10747 distributed: Disable ARG Manager 2014-07-13 14:20:54 -04:00
Harvir
5783849585 toon: Don't attempt to iterate through an integer value (I hate you disney). 2014-07-12 17:49:08 +01:00
Harvir
ee118f69c0 suitplanner: Add delete() method to base class for clean-up (fixes crash) 2014-07-12 15:52:05 +01:00
Sam Edwards
ba23ebc5ca estate: TreasurePlanners must be stopped, not requestDeleted. 
This fixes a crash; pushed directly to master.
 2014-07-11 23:22:42 -07:00
jjkoletar
100eb91e79 Merge branch 'beta-wip' into 'master' 
7/9 update

Just a bunch of bugfixes. Main purpose is to disable the invasions that have gone on long enough.
 2014-07-11 18:52:33 -06:00
jjkoletar
c6aeea917b Merge branch 'missing-laff-fix' into 'beta-wip' 
Missing laff fix

Only counts the last quest in a full ToonTask.

Note that we should still be running in log only mode to test this addition.
 2014-07-11 18:51:37 -06:00
Joey Z
d1540ac1b5 invasion: Don't use specialSuit in boss battles 2014-07-11 02:07:14 -04:00
Harvir
c52d90dd05 toon: Be a bit smarter... 2014-07-09 19:55:27 +01:00
Harvir
f84f4cdd37 toon: Better toon-up task tracking. 
Now will stop toonup if toon takes damage (regardless of zone).
Tick also always reconsiders the task each tick.
 2014-07-09 15:30:39 +01:00
Sam Edwards
c3d08c0e0e ai: Add watchdog timer that kills the AI server if it freezes. 2014-07-08 23:51:12 -07:00
Sam Edwards
cc5cb2c84a rpc: Expose heap (objects/garbage) stats over listShards(). 2014-07-08 23:40:26 -07:00
Sam Edwards
21ae3a6a46 magicwords: Add magic words for system diagnostics. 2014-07-08 23:27:56 -07:00
Joey Z
3811586eca fireworks: Don't set the background color if the Shtickerbook is open 2014-07-08 18:06:06 -04:00
Joey Z
b38f51c99a toonbase: Improve screenshot shutter effect. 2014-07-08 02:02:07 -04:00
Hawkheart
61ec2ea1be Merge branch 'fix-diving-game' into 'beta-wip' 
Fix bug in (and generally clean up) diving game

Still trying to get back in the swing of TTR development, so here's a lesser MR to fix an issue that's been annoying me whenever I look at MEAT.

The motivation for this is in the message for the last commit. In addition to general cleanup, this MR:
* Fixes up some general security.
* Solves the issue of random suspicious events relating to DivingGameAI.
* **Fixes a bug where players are unable to pick up or redeem treasures after touching a chest and fish/crab near-simultaneously.**
 2014-07-07 21:49:20 -06:00
Joey Z
a3360465e4 estate: Move treasures to DEstateAI at the request of Hawkheart 2014-07-07 22:55:15 -04:00
Joey Z
b3240db399 estate: Cleanup is for chums 2014-07-07 22:33:31 -04:00
Joey Z
a276c13a12 estate: Spawn popsicle treasures 2014-07-07 21:57:05 -04:00
Joey Z
83f002223f toon: Don't make the nametag follow the toon head when teleporting, instead hide it after jumping in the hole 2014-07-07 21:57:05 -04:00
Harvir
b5c26aa1a7 toon: We only care about the final quest in laff correction. 2014-07-07 13:34:20 +01:00
Harvir
bcdea5b04b Merge branch 'beta-wip' into missing-laff-fix 2014-07-07 12:50:17 +01:00
Sam Edwards
31d075d16d minigame: Refactor diving game's treasure pickup/drop logic. 
Fixes race conditions between client and server.
Solves the issue of spurious suspicious events.
Fixes bug where players are unable to pick up or redeem treasures after touching a chest and fish/crab near-simultaneously.
 2014-07-07 00:12:06 -07:00
Sam Edwards
0d673aa3ea minigame: Fix amusing yet confusing typo. 2014-07-06 23:15:08 -07:00
Sam Edwards
0a3c77a80c minigame: In diving, DON'T send the avId along with fish/crab collisions. This is not only redundant, but also insecure. 2014-07-06 23:13:07 -07:00
Sam Edwards
6ad5e3755c minigame: Clean up the crab test in the diving game. 2014-07-06 23:03:42 -07:00
Harv
b813ae457d Merge branch 'beta-wip' into 'master' 
Beta wip

Fixes all the shit I broke
 2014-07-06 18:08:25 -06:00
jjkoletar
38bebbcffd Merge branch 'missing-laff-fix' into 'beta-wip' 
Laff Correction

**WARNING: Do not take this MR lightly! This could potentially break prod if we don't test this properly and then unseen errors occur.**

This will fix the missing fishing boost that people lost when we first reset the servers at the start of beta. This will also fix the quest glitch where people gained extra laff from the NPC glitch where multiple NPCs were in one spot. Their maxHp will be bumped up or down respectively.

~~Note that this does not currently consider any boosts from Golf, and possibly other things that I may have forgotten. If I have forgot anything (other than Golf, someone else can do that >.>) please let me know before this gets merged in.~~

Totals: 100 story, 20 suits, 7 fishing, 3 racing, 3 golfing, 4 gardening. = 137 Laff (max)
 2014-07-06 16:51:12 -06:00
Harvir
c0164fa1b0 toon: Add a 'log only' mode. (Concern 1) 2014-07-06 23:34:55 +01:00
Anthony Castelli
700161c602 quests: 🐬 2014-07-06 15:30:47 -07:00
Harvir
be9f9ee74a toon: Clean up logging (remove reason, each gained value is a separate 
kwarg). (Nitpick 2)
 2014-07-06 23:30:41 +01:00
Harvir
65623eed8e toon: Calculate hp at the end rather than during each calculation. (Nitpick 1) 2014-07-06 23:27:32 +01:00
Anthony Castelli
6592b63b58 quests: Use LOOPING_FINAL_TIER instead of ELDER_TIER 2014-07-06 15:15:05 -07:00
Anthony Castelli
93c8c82a26 quests: Fix ELDER_TIER 2014-07-06 15:10:39 -07:00
Joey Z
60cd5ae2b8 invasion: Allow mega-invasions to spawn 2.0 or Skelecogs 2014-07-06 18:02:31 -04:00
Harvir
7f6a8966e6 holiday: tabs to spaces 2014-07-06 20:26:41 +01:00
Harvir
6c5aa0eb75 invasions: lazy to type a message. plz test <3 2014-07-06 20:21:58 +01:00
Anthony Castelli
75f100d8a1 holiday-manager: Pass in the air 2014-07-06 12:13:39 -07:00
Anthony Castelli
12f50eeee0 holiday-manager: Fireworks 2014-07-06 11:28:53 -07:00
Anthony Castelli
d83d656217 fireworks: I'm an idiot 2014-07-05 21:33:18 -07:00
Jeremy Koletar
a471eb5141 Merge branch 'beta-wip' of git.riotcave.com:privatetoon/toontown 2014-07-05 16:13:05 -05:00
Aidan Noll
cfaed6c144 toonbase: restrict resource packs to oggs, jpegs, and rgbs 2014-07-05 16:07:54 -04:00
Aidan Noll
c2b3e69b7c config files and push antialias 0 to file 2014-07-05 15:23:51 -04:00
Aidan Noll
de7c1c6aa6 toonbase: disable AA by default, make it an option 2014-07-05 15:05:14 -04:00
Anthony Castelli
d1d0278ca5 fireworks: Fix the magic word 2014-07-05 10:33:15 -07:00
Joey Z
317d8e90dd fireworks: Fix attribute error in the magic word 2014-07-04 16:12:05 -04:00
Joey Z
c6a1b9a61a hood: 🐬 2014-07-04 15:00:30 -04:00
Joey Z
64241c0a4d hood: Consistency 2014-07-04 14:17:13 -04:00
Harvir
992d622615 fireworks: Fix attribute error. 2014-07-04 19:14:57 +01:00
Anthony Castelli
9401ef1526 fireworks: Raise an AttributeError for an invalid firework 2014-07-04 10:48:15 -07:00
Anthony Castelli
0891e556fa Another 🐬 2014-07-04 10:40:23 -07:00
Anthony Castelli
f64c5a7b69 fireworks: fix a few 🐬 2014-07-04 10:38:58 -07:00
Anthony Castelli
c50f0489f4 fireworks: Hourly fireworks 2014-07-04 10:24:20 -07:00
Anthony Castelli
a593719d9f fireworks: Hack-fix the new fireworks timing. 2014-07-04 09:57:03 -07:00
Harvir
c80df5d2d9 invasions: Configuration for the time-per-cog timer. 2014-07-04 17:43:35 +01:00
Harvir
1206cae8cc invasions: Clean up init. 2014-07-04 17:41:21 +01:00
Harvir
99b339e29b invasions: Joey pls. Clean is gud. 2014-07-04 17:39:30 +01:00
Anthony Castelli
5e3571ebd9 fireworks: hack-fix postShow 2014-07-04 09:18:50 -07:00
Harvir
1772d97732 toon: Magic word to manually correct a toon's laff. 2014-07-04 16:38:42 +01:00
Harvir
633629a2fb toon: Don't attempt to correct laff if at SYSADMIN level. 2014-07-04 16:35:24 +01:00
Harvir
8903157d8e toon: We can't get multiple credit for a single quest(id) that happens to occur multiple times. 2014-07-04 16:33:27 +01:00
Joey Z
69184876a0 invasion: One more tweak, make the timer occur slightly more often 2014-07-04 03:16:36 -04:00
Joey Z
08127fbecc invasion: Extend the end invasion timer 
1000 cogs per 20 minutes is actually VERY accurate right now based on the API, however we don't want to make it the exact amount of time it takes to defeat an invasion. The timer is meant to kill the invasion if people are struggling with it, not kill it at the same time an active group should be finishing it.
 2014-07-04 03:12:59 -04:00
Joey Z
532035f99f invasion: Tweak values based on community feedback 
We should begin tracking when invasions end, whether they are ended by the timer or by the players so we can tweak them to get it perfect. Players are currently reporting very short invasions.
 2014-07-04 03:03:18 -04:00
Joey Z
e3466ac779 Add a timer for mega-invasions, set it to Legal Eagles for the 4th of July 2014-07-04 02:41:50 -04:00