Author Topic: !layout 2.0  (Read 16149 times)

doomagent13

  • Posts: 506
  • Turrets: +18/-18
!layout 2.0
« on: June 07, 2007, 10:52:23 pm »
THIS is the link to the patch file.  It may or may not patch properly--I dont exactly understand write how to make a patch.  THIS INCLUDES THE ENTIRE !LAYOUT SYSTEM, NOT JUST A FEW ADDED PIECES!

This is a patch for svn revision 872, but it probably should work on higher versions.
Included features:
Anything in Risujin's last release (that I could find in patch format) of !layout

New features:
!listlayouts for all
!listmaps
!restart (layout)
Vote support:
    Restart votes with a specific starting layout
    Map votes with a specific starting layout
Ability to use ONE specific "default" layout

New Cvars: (compared to svn 872)
g_layout -- enables the whole system -- defaults to "1"
g_layoutAuto -- enables loading of a layout at the beginning of each map -- defaults to "1"
g_nextLayout -- Cvar to store next layout -- IT IS RECOMENDED THAT THIS NOT BE PLAYED WITH
g_defaultLayoutOnly -- forces only some "default" layout to be loaded -- defaults to "1"
g_defaultLayoutName -- names the "default" layout -- defaults to "default"

New admin commands: (compared to svn 872)
!layout (arg/args) -- the base of this whole layout system
!listlayouts (mapname) -- lists the layouts for a given map or the current map if a map is not specified
!listmaps -- list the maps on the server

I am sorry that I cannot provide a precompiled qvm, but I am still working on getting my computer to compile qvms at all.  This should patch cleanly, but may run into trouble in particular with the changes to Cmd_callvote_f.

EDIT:
The download files should now work.

PFB

  • Guest
!layout 2.0
« Reply #1 on: June 07, 2007, 11:33:17 pm »
still saves just the buildables ... nothing interesting

David

  • Spam Killer
  • *
  • Posts: 3543
  • Turrets: +249/-273
!layout 2.0
« Reply #2 on: June 07, 2007, 11:56:06 pm »
Risujin's layout?
isn't that old and not supported?
And superseded by the one is SVN?
Or am I missing somthing...
Any maps not in the MG repo?  Email me or come to irc.freenode.net/#mg.
--
My words are mine and mine alone.  I can't speak for anyone else, and there is no one who can speak for me.  If I ever make a post that gives the opinions or positions of other users or groups, then they will be clearly labeled as such.
I'm disappointed that people's past actions have forced me to state what should be obvious.
I am not a dev.  Nothing I say counts for anything.

doomagent13

  • Posts: 506
  • Turrets: +18/-18
!layout 2.0
« Reply #3 on: June 08, 2007, 12:03:27 am »
Quote from: "PFB"
still saves just the buildables ... nothing interesting
What else is there to save?  Tell me that and maybe I could make it.
Quote from: "David"
Risujin's layout?
isn't that old and not supported?
And superseded by the one is SVN?
Or am I missing somthing...
Which do you prefer?  Or have you even used ONE of them?  Not to flame or anything, but TJW's is designed for nearly exclusively console usage.  Risujin's is much more admin-friendly, as it does not require either a !devmap command or giving out the rconpassword.  While it IS abusible, that is up to the server op to limit it to only the trustable admins.

Oh, and yes, this is not in svn.  Dont ask my why, because I dont know.  All I know is which I preferr, and this is it.

PFB

  • Guest
!layout 2.0
« Reply #4 on: June 08, 2007, 12:07:20 am »
triggers targets world spawns
ie every entity you can place in the gtk radiant

so you can create different game types for each game

at least world spawn so you can disable equipment classes weapons

doomagent13

  • Posts: 506
  • Turrets: +18/-18
!layout 2.0
« Reply #5 on: June 08, 2007, 02:05:40 am »
Quote from: "PFB"
triggers targets world spawns
ie every entity you can place in the gtk radiant

so you can create different game types for each game

at least world spawn so you can disable equipment classes weapons
You mean so that certain equipment, classes, and weapons can be disabled with only specific layouts?  If TJW got the basic disabling of those finished, and it looks like he did, at least in the most recent svn, it shouldnt be too hard.  As far as triggers go, arent they supposed to be placed by the mapper? (I could be mistaken about what you mean, so please enlighten)  Arent targets more of the same? (Again, please enlighten)

PFB

  • Guest
!layout 2.0
« Reply #6 on: June 08, 2007, 02:29:53 am »
triggers can be hard (but it would be cool; you could place a trigger hurt somewhere)
but  world spawn is easy (not world spawn's it self but g_vars)

oh and spec points so if you change the layout you will also want to change spec points(omg I see you base .... etc)

Lakitu7

  • Tremulous Developers
  • *
  • Posts: 1002
  • Turrets: +120/-73
!layout 2.0
« Reply #7 on: June 08, 2007, 02:32:11 am »
~/layout2/src/game
$ patch -p0 <doomagent13-\!layout-2.0.patch
patching file `g_local.h'
Hunk #1 succeeded at 542 (offset 2 lines).
Hunk #2 FAILED at 648.
patch: **** malformed patch at line 33:  void      trap_Printf( const char *fmt );



You need to generate the .patch file. You can't edit an existing one this extensively and have it work. Download from SVN, make your changes, then do svn diff >!layout2.0.patch

Upload to mercenariesguild.net/patches instead of megaupload please. It's a lot nicer.


This seems to include other things for some reason. I see some components of stickyspec. I see a ton of lines that are "changed" but there's no actual changes. huh?


872 is from BEFORE svn layout (r886). There's no way on earth that this will apply to anything afterward. It may have added some features, but what people are really demanding is making Risujin's old code work with newer SVNs. If they wanted to just use 872 they could have used Risujin's version. :(

doomagent13

  • Posts: 506
  • Turrets: +18/-18
!layout 2.0
« Reply #8 on: June 08, 2007, 02:43:02 am »
Ok, I'll redo it. :(   Should be done by next week. (but dont quote me on this)

Lakitu7

  • Tremulous Developers
  • *
  • Posts: 1002
  • Turrets: +120/-73
!layout 2.0
« Reply #9 on: June 08, 2007, 02:49:03 am »
I'm sorry. :( I'm trying to at least tell you helpfully. :( I'm not really here to stomp on your ideas; I'm trying to be constructive.

doomagent13

  • Posts: 506
  • Turrets: +18/-18
!layout 2.0
« Reply #10 on: June 08, 2007, 03:14:29 am »
I know. :D   I wasnt exactly expecting my patch to work, but I am allowed to hope.

Paradox

  • Posts: 2612
  • Turrets: +253/-250
    • Paradox Designs
!layout 2.0
« Reply #11 on: June 08, 2007, 04:14:53 am »
I thought there were old cvars for g_disabledClasses, g_disabledBuildables, and g_disabledEquip? These do anything? They are read only.

∧OMG ENTROPY∧

doomagent13

  • Posts: 506
  • Turrets: +18/-18
!layout 2.0
« Reply #12 on: June 08, 2007, 04:40:36 pm »
Quote from: "Paradox"
I thought there were old cvars for g_disabledClasses, g_disabledBuildables, and g_disabledEquip? These do anything? They are read only.
:eek:  :eek:  :eek:
Read only?

I guess I need to hope that they can be changed by the qvm...

Paradox

  • Posts: 2612
  • Turrets: +253/-250
    • Paradox Designs
!layout 2.0
« Reply #13 on: June 08, 2007, 09:13:13 pm »
Quote from: "doomagent13"
Quote from: "Paradox"
I thought there were old cvars for g_disabledClasses, g_disabledBuildables, and g_disabledEquip? These do anything? They are read only.
:eek:  :eek:  :eek:
Read only?

I guess I need to hope that they can be changed by the qvm...

I think you can change them using a maprotation block or a mapconfig.

∧OMG ENTROPY∧

doomagent13

  • Posts: 506
  • Turrets: +18/-18
!layout 2.0
« Reply #14 on: June 09, 2007, 12:45:42 am »
Quote from: "Paradox"
Quote from: "doomagent13"
Quote from: "Paradox"
I thought there were old cvars for g_disabledClasses, g_disabledBuildables, and g_disabledEquip? These do anything? They are read only.
:eek:  :eek:  :eek:
Read only?

I guess I need to hope that they can be changed by the qvm...


I think you can change them using a maprotation block or a mapconfig.
But can they be changed by the qvm 5-7 frames into the map?  Cause that is when layouts are loaded.

kevlarman

  • Posts: 2737
  • Turrets: +291/-295
!layout 2.0
« Reply #15 on: June 09, 2007, 12:48:07 am »
Quote from: "doomagent13"
Quote from: "Paradox"
Quote from: "doomagent13"
Quote from: "Paradox"
I thought there were old cvars for g_disabledClasses, g_disabledBuildables, and g_disabledEquip? These do anything? They are read only.
:eek:  :eek:  :eek:
Read only?

I guess I need to hope that they can be changed by the qvm...


I think you can change them using a maprotation block or a mapconfig.
But can they be changed by the qvm 5-7 frames into the map?  Cause that is when layouts are loaded.
you can't set read only cvars while the server is running (even between maps), you can only change them with a command line option, but the server binary and vms are under no such restriction.
Quote from: Asvarox link=topic=8622.msg169333#msg169333
Ok let's plan it out. Asva, you are nub, go sit on rets, I will build, you two go feed like hell, you go pwn their asses, and everyone else camp in the hallway, roger?
the dretch bites.
-----
|..d| #
|.@.-##
-----

n00b pl0x

  • Posts: 2412
  • Turrets: +55/-168
!layout 2.0
« Reply #16 on: June 09, 2007, 03:11:18 am »
make it work pls

this layout > ris/tjw layout
will sort out my sig, or I will get banned.

HOW DO I SORTED SIG?

Paradox

  • Posts: 2612
  • Turrets: +253/-250
    • Paradox Designs
!layout 2.0
« Reply #17 on: June 13, 2007, 04:51:07 pm »
Yes doom, please release the fixed patch please.

∧OMG ENTROPY∧

doomagent13

  • Posts: 506
  • Turrets: +18/-18
!layout 2.0
« Reply #18 on: June 13, 2007, 07:25:41 pm »
I am working on it.

Two notes:

1) Currently, everything but !layout edit should work.
2) Votes will almost certainly need to be manually changed.

Paradox

  • Posts: 2612
  • Turrets: +253/-250
    • Paradox Designs
!layout 2.0
« Reply #19 on: June 13, 2007, 07:31:05 pm »
Dont really need the votes now, but the layout is what is high on my radar.

∧OMG ENTROPY∧

doomagent13

  • Posts: 506
  • Turrets: +18/-18
!layout 2.0
« Reply #20 on: June 13, 2007, 09:27:47 pm »
I have reuploaded it in 2 versions, one a complete .patch, the other a bunch of instructions for adjusting the previous version to this version.  Now that it really should work, I will work on adding storage of Cvars.

benmachine

  • Posts: 915
  • Turrets: +99/-76
    • ben's machinery
!layout 2.0
« Reply #21 on: June 14, 2007, 02:46:30 pm »
needs less megaupload and more
http://www.mercenariesguild.net/patches/
tbh
benmachine